From e4cef685598050ae60693f1694eed012abf1cdb2 Mon Sep 17 00:00:00 2001
From: Robert Relyea <rrelyea@redhat.com>
Date: Mon, 16 Sep 2024 15:12:49 -0700
Subject: [PATCH] Resolves: RHEL-58985

Use the correct fixed patch from 8.8.0.z to fix the abi break
---
 nss-3.101-fix-cms-abi-break.patch | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/nss-3.101-fix-cms-abi-break.patch b/nss-3.101-fix-cms-abi-break.patch
index 2816630..c60fab6 100644
--- a/nss-3.101-fix-cms-abi-break.patch
+++ b/nss-3.101-fix-cms-abi-break.patch
@@ -1,18 +1,18 @@
 diff -up ./lib/smime/cmsasn1.c.restore_abi ./lib/smime/cmsasn1.c
 --- ./lib/smime/cmsasn1.c.restore_abi	2024-06-07 09:26:03.000000000 -0700
-+++ ./lib/smime/cmsasn1.c	2024-09-06 11:17:01.609516368 -0700
-@@ -347,7 +347,7 @@ static const SEC_ASN1Template NSSCMSKeyA
-     { SEC_ASN1_EXPLICIT | SEC_ASN1_CONSTRUCTED | SEC_ASN1_CONTEXT_SPECIFIC | 0,
-       offsetof(NSSCMSKeyAgreeRecipientInfo, originatorIdentifierOrKey),
-       NSSCMSOriginatorIdentifierOrKeyTemplate },
--    { SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | SEC_ASN1_EXPLICIT |
-+    { SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | SEC_ASN1_POINTER |
++++ ./lib/smime/cmsasn1.c	2024-09-06 18:05:27.808338289 -0700
+@@ -350,7 +350,7 @@ static const SEC_ASN1Template NSSCMSKeyA
+     { SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | SEC_ASN1_EXPLICIT |
            SEC_ASN1_CONTEXT_SPECIFIC | SEC_ASN1_XTRN | 1,
        offsetof(NSSCMSKeyAgreeRecipientInfo, ukm),
-       SEC_ASN1_SUB(SEC_OctetStringTemplate) },
+-      SEC_ASN1_SUB(SEC_OctetStringTemplate) },
++      SEC_ASN1_SUB(SEC_PointerToOctetStringTemplate) },
+     { SEC_ASN1_INLINE | SEC_ASN1_XTRN,
+       offsetof(NSSCMSKeyAgreeRecipientInfo, keyEncAlg),
+       SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) },
 diff -up ./lib/smime/cmslocal.h.restore_abi ./lib/smime/cmslocal.h
 --- ./lib/smime/cmslocal.h.restore_abi	2024-06-07 09:26:03.000000000 -0700
-+++ ./lib/smime/cmslocal.h	2024-09-06 11:16:00.674783508 -0700
++++ ./lib/smime/cmslocal.h	2024-09-06 18:04:47.647863624 -0700
 @@ -174,7 +174,7 @@ NSS_CMSUtil_DecryptSymKey_RSA_OAEP(SECKE
  
  extern SECStatus
@@ -24,7 +24,7 @@ diff -up ./lib/smime/cmslocal.h.restore_abi ./lib/smime/cmslocal.h
  PK11SymKey *
 diff -up ./lib/smime/cmspubkey.c.restore_abi ./lib/smime/cmspubkey.c
 --- ./lib/smime/cmspubkey.c.restore_abi	2024-06-07 09:26:03.000000000 -0700
-+++ ./lib/smime/cmspubkey.c	2024-09-06 11:16:00.674783508 -0700
++++ ./lib/smime/cmspubkey.c	2024-09-06 18:04:47.647863624 -0700
 @@ -292,9 +292,15 @@ Create_ECC_CMS_SharedInfo(PLArenaPool *p
      unsigned char suppPubInfo[4] = { 0 };
  
@@ -91,7 +91,7 @@ diff -up ./lib/smime/cmspubkey.c.restore_abi ./lib/smime/cmspubkey.c
      SharedInfo = Create_ECC_CMS_SharedInfo(poolp, &keyWrapAlg,
 diff -up ./lib/smime/cmsrecinfo.c.restore_abi ./lib/smime/cmsrecinfo.c
 --- ./lib/smime/cmsrecinfo.c.restore_abi	2024-06-07 09:26:03.000000000 -0700
-+++ ./lib/smime/cmsrecinfo.c	2024-09-06 11:16:00.674783508 -0700
++++ ./lib/smime/cmsrecinfo.c	2024-09-06 18:04:47.647863624 -0700
 @@ -582,7 +582,7 @@ NSS_CMSRecipientInfo_UnwrapBulkKey(NSSCM
              parameters = &(ri->ri.keyAgreeRecipientInfo.keyEncAlg.parameters);
              enckey = &(ri->ri.keyAgreeRecipientInfo.recipientEncryptedKeys[subIndex]->encKey);
@@ -103,7 +103,7 @@ diff -up ./lib/smime/cmsrecinfo.c.restore_abi ./lib/smime/cmsrecinfo.c
              algid = &(ri->ri.kekRecipientInfo.keyEncAlg);
 diff -up ./lib/smime/cmst.h.restore_abi ./lib/smime/cmst.h
 --- ./lib/smime/cmst.h.restore_abi	2024-06-07 09:26:03.000000000 -0700
-+++ ./lib/smime/cmst.h	2024-09-06 11:16:00.674783508 -0700
++++ ./lib/smime/cmst.h	2024-09-06 18:04:47.647863624 -0700
 @@ -376,7 +376,7 @@ typedef struct NSSCMSRecipientEncryptedK
  struct NSSCMSKeyAgreeRecipientInfoStr {
      SECItem version;