Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 105 insertions, 22 deletions

diff --git a/security/nss/automation/abi-check/expected-report-libnss3.so.txt b/security/nss/automation/abi-check/expected-report-libnss3.so.txt
index 582afe387f..97f1a7cdd8 100644
--- a/security/nss/automation/abi-check/expected-report-libnss3.so.txt
+++ b/security/nss/automation/abi-check/expected-report-libnss3.so.txt
@@ -5,11 +5,20 @@
     parameter 2 of type 'typedef SECOidTag' has sub-type changes:
       underlying type 'enum __anonymous_enum__' at secoidt.h:34:1 changed:
         type size hasn't changed
-        2 enumerator insertions:
-          '__anonymous_enum__::SEC_OID_ED25519_SIGNATURE' value '373'
-          '__anonymous_enum__::SEC_OID_ED25519_PUBLIC_KEY' value '374'
+        10 enumerator insertions:
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_STDDH_SHA1KDF_SCHEME' value '375'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_STDDH_SHA224KDF_SCHEME' value '376'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_STDDH_SHA256KDF_SCHEME' value '377'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_STDDH_SHA384KDF_SCHEME' value '378'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_STDDH_SHA512KDF_SCHEME' value '379'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_COFACTORDH_SHA1KDF_SCHEME' value '380'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_COFACTORDH_SHA224KDF_SCHEME' value '381'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_COFACTORDH_SHA256KDF_SCHEME' value '382'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_COFACTORDH_SHA384KDF_SCHEME' value '383'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_COFACTORDH_SHA512KDF_SCHEME' value '384'
 
         1 enumerator change:
-          '__anonymous_enum__::SEC_OID_TOTAL' from value '373' to '375' at secoidt.h:34:1
+          '__anonymous_enum__::SEC_OID_TOTAL' from value '375' to '385' at secoidt.h:34:1
+
 
 
diff --git a/security/nss/automation/abi-check/expected-report-libnssutil3.so.txt b/security/nss/automation/abi-check/expected-report-libnssutil3.so.txt
index ed076df300..f0d77ef369 100644
--- a/security/nss/automation/abi-check/expected-report-libnssutil3.so.txt
+++ b/security/nss/automation/abi-check/expected-report-libnssutil3.so.txt
@@ -1,15 +1,24 @@
 
 1 function with some indirect sub-type change:
 
-  [C]'function SECStatus NSS_GetAlgorithmPolicy(SECOidTag, PRUint32*)' at secoid.c:2291:1 has some indirect sub-type changes:
+  [C]'function SECStatus NSS_GetAlgorithmPolicy(SECOidTag, PRUint32*)' at secoid.c:2336:1 has some indirect sub-type changes:
     parameter 1 of type 'typedef SECOidTag' has sub-type changes:
       underlying type 'enum __anonymous_enum__' at secoidt.h:34:1 changed:
         type size hasn't changed
-        2 enumerator insertions:
-          '__anonymous_enum__::SEC_OID_ED25519_SIGNATURE' value '373'
-          '__anonymous_enum__::SEC_OID_ED25519_PUBLIC_KEY' value '374'
+        10 enumerator insertions:
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_STDDH_SHA1KDF_SCHEME' value '375'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_STDDH_SHA224KDF_SCHEME' value '376'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_STDDH_SHA256KDF_SCHEME' value '377'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_STDDH_SHA384KDF_SCHEME' value '378'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_STDDH_SHA512KDF_SCHEME' value '379'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_COFACTORDH_SHA1KDF_SCHEME' value '380'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_COFACTORDH_SHA224KDF_SCHEME' value '381'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_COFACTORDH_SHA256KDF_SCHEME' value '382'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_COFACTORDH_SHA384KDF_SCHEME' value '383'
+          '__anonymous_enum__::SEC_OID_DHSINGLEPASS_COFACTORDH_SHA512KDF_SCHEME' value '384'
 
         1 enumerator change:
-          '__anonymous_enum__::SEC_OID_TOTAL' from value '373' to '375' at secoidt.h:34:1
+          '__anonymous_enum__::SEC_OID_TOTAL' from value '375' to '385' at secoidt.h:34:1
+
 
 
diff --git a/security/nss/automation/abi-check/expected-report-libsmime3.so.txt b/security/nss/automation/abi-check/expected-report-libsmime3.so.txt
index 69cd2ae3a9..a42f62c39a 100644
--- a/security/nss/automation/abi-check/expected-report-libsmime3.so.txt
+++ b/security/nss/automation/abi-check/expected-report-libsmime3.so.txt
@@ -1,8 +1,4 @@
 
-1 Added function:
-
-  'function PRBool NSS_CMSRecipient_IsSupported(CERTCertificate*)'    {NSS_CMSRecipient_IsSupported@@NSS_3.99}
-
 1 function with some indirect sub-type change:
 
   [C]'function PK11SymKey* NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo*)' at cmscinfo.c:426:1 has some indirect sub-type changes:
@@ -14,34 +10,103 @@
            type of 'NSSCMSContent NSSCMSContentInfoStr::content' changed:
              underlying type 'union NSSCMSContentUnion' at cmst.h:113:1 changed:
                type size hasn't changed
-               1 data member changes (3 filtered):
+               2 data member changes (2 filtered):
                 type of 'NSSCMSEncryptedData* NSSCMSContentUnion::encryptedData' changed:
                   in pointed to type 'typedef NSSCMSEncryptedData' at cmst.h:65:1:
-                    underlying type 'struct NSSCMSEncryptedDataStr' at cmst.h:463:1 changed:
+                    underlying type 'struct NSSCMSEncryptedDataStr' at cmst.h:470:1 changed:
                       type size hasn't changed
                       1 data member changes (1 filtered):
                        type of 'NSSCMSAttribute** NSSCMSEncryptedDataStr::unprotectedAttr' changed:
                          in pointed to type 'NSSCMSAttribute*':
                            in pointed to type 'typedef NSSCMSAttribute' at cmst.h:69:1:
-                             underlying type 'struct NSSCMSAttributeStr' at cmst.h:482:1 changed:
+                             underlying type 'struct NSSCMSAttributeStr' at cmst.h:489:1 changed:
                                type size hasn't changed
                                1 data member change:
                                 type of 'SECOidData* NSSCMSAttributeStr::typeTag' changed:
                                   in pointed to type 'typedef SECOidData' at secoidt.h:16:1:
-                                    underlying type 'struct SECOidDataStr' at secoidt.h:536:1 changed:
+                                    underlying type 'struct SECOidDataStr' at secoidt.h:547:1 changed:
                                       type size hasn't changed
                                       1 data member change:
                                        type of 'SECOidTag SECOidDataStr::offset' changed:
                                          underlying type 'enum __anonymous_enum__' at secoidt.h:34:1 changed:
                                            type size hasn't changed
-                                           2 enumerator insertions:
-                                             '__anonymous_enum__::SEC_OID_ED25519_SIGNATURE' value '373'
-                                             '__anonymous_enum__::SEC_OID_ED25519_PUBLIC_KEY' value '374'
+                                           10 enumerator insertions:
+                                             '__anonymous_enum__::SEC_OID_DHSINGLEPASS_STDDH_SHA1KDF_SCHEME' value '375'
+                                             '__anonymous_enum__::SEC_OID_DHSINGLEPASS_STDDH_SHA224KDF_SCHEME' value '376'
+                                             '__anonymous_enum__::SEC_OID_DHSINGLEPASS_STDDH_SHA256KDF_SCHEME' value '377'
+                                             '__anonymous_enum__::SEC_OID_DHSINGLEPASS_STDDH_SHA384KDF_SCHEME' value '378'
+                                             '__anonymous_enum__::SEC_OID_DHSINGLEPASS_STDDH_SHA512KDF_SCHEME' value '379'
+                                             '__anonymous_enum__::SEC_OID_DHSINGLEPASS_COFACTORDH_SHA1KDF_SCHEME' value '380'
+                                             '__anonymous_enum__::SEC_OID_DHSINGLEPASS_COFACTORDH_SHA224KDF_SCHEME' value '381'
+                                             '__anonymous_enum__::SEC_OID_DHSINGLEPASS_COFACTORDH_SHA256KDF_SCHEME' value '382'
+                                             '__anonymous_enum__::SEC_OID_DHSINGLEPASS_COFACTORDH_SHA384KDF_SCHEME' value '383'
+                                             '__anonymous_enum__::SEC_OID_DHSINGLEPASS_COFACTORDH_SHA512KDF_SCHEME' value '384'
 
                                            1 enumerator change:
-                                             '__anonymous_enum__::SEC_OID_TOTAL' from value '373' to '375' at secoidt.h:34:1
+                                             '__anonymous_enum__::SEC_OID_TOTAL' from value '375' to '385' at secoidt.h:34:1
+
+
+
+
+
+                type of 'NSSCMSEnvelopedData* NSSCMSContentUnion::envelopedData' changed:
+                  in pointed to type 'typedef NSSCMSEnvelopedData' at cmst.h:60:1:
+                    underlying type 'struct NSSCMSEnvelopedDataStr' at cmst.h:257:1 changed:
+                      type size hasn't changed
+                      1 data member changes (2 filtered):
+                       type of 'NSSCMSRecipientInfo** NSSCMSEnvelopedDataStr::recipientInfos' changed:
+                         in pointed to type 'NSSCMSRecipientInfo*':
+                           in pointed to type 'typedef NSSCMSRecipientInfo' at cmst.h:62:1:
+                             underlying type 'struct NSSCMSRecipientInfoStr' at cmst.h:439:1 changed:
+                               type size changed from 1536 to 1664 bits
+                               3 data member changes:
+                                type of '__anonymous_union__ NSSCMSRecipientInfoStr::ri' changed:
+                                  type size changed from 1344 to 1472 bits
+                                  2 data member changes:
+                                   type of 'NSSCMSKEKRecipientInfo __anonymous_union__::kekRecipientInfo' changed:
+                                     underlying type 'struct NSSCMSKEKRecipientInfoStr' at cmst.h:397:1 changed:
+                                       type size hasn't changed
+                                       1 data member change:
+                                        type of 'NSSCMSKEKIdentifier NSSCMSKEKRecipientInfoStr::kekIdentifier' changed:
+                                          underlying type 'struct NSSCMSKEKIdentifierStr' at cmst.h:390:1 changed:
+                                            type size hasn't changed
+                                            1 data member change:
+                                             type of 'SECItem* NSSCMSKEKIdentifierStr::other' changed:
+                                               in pointed to type 'typedef SECItem' at cmst.h:347:1:
+                                                 underlying type 'struct SECItemStr' at cmst.h:342:1 changed:
+                                                   type name changed from 'SECItemStr' to 'NSSCMSOtherKeyAttributeStr'
+                                                   type size changed from 192 to 384 bits
+                                                   2 data member deletions:
+                                                     'unsigned char* SECItemStr::data', at offset 64 (in bits) at seccomon.h:52:1
+
+                                                     'unsigned int SECItemStr::len', at offset 128 (in bits) at seccomon.h:53:1
+
+                                                   1 data member insertion:
+                                                     'SECItem NSSCMSOtherKeyAttributeStr::keyAttr', at offset 192 (in bits) at cmst.h:344:1
+                                                   1 data member change:
+                                                    type of 'SECItemType SECItemStr::type' changed:
+                                                      underlying type 'enum __anonymous_enum__' at seccomon.h:50:1 changed:
+                                                        entity changed from 'enum __anonymous_enum__' to 'struct SECItemStr' at seccomon.h:50:1
+                                                        type size changed from 32 to 192 bits
+                                                        type alignment changed from 32 to 0 bits
+
+
+
+
+                                   type of 'NSSCMSKeyAgreeRecipientInfo __anonymous_union__::keyAgreeRecipientInfo' changed:
+                                     underlying type 'struct NSSCMSKeyAgreeRecipientInfoStr' at cmst.h:376:1 changed:
+                                       type size changed from 1344 to 1472 bits
+                                       3 data member changes:
+                                        type of 'SECItem* NSSCMSKeyAgreeRecipientInfoStr::ukm' changed:
+                                          entity changed from 'SECItem*' to 'typedef SECItem' at seccomon.h:48:1
+                                          type size changed from 64 to 192 bits
+
+                                        'SECAlgorithmID NSSCMSKeyAgreeRecipientInfoStr::keyEncAlg' offset changed from 896 to 1024 (in bits) (by +128 bits)
+                                        'NSSCMSRecipientEncryptedKey** NSSCMSKeyAgreeRecipientInfoStr::recipientEncryptedKeys' offset changed from 1280 to 1408 (in bits) (by +128 bits)
 
 
+                                'NSSCMSMessage* NSSCMSRecipientInfoStr::cmsg' offset changed from 1408 to 1536 (in bits) (by +128 bits)
+                                'CERTCertificate* NSSCMSRecipientInfoStr::cert' offset changed from 1472 to 1600 (in bits) (by +128 bits)
 
 
 
diff --git a/security/nss/automation/abi-check/previous-nss-release b/security/nss/automation/abi-check/previous-nss-release
index 0dea1b7b74..335e901dad 100644
--- a/security/nss/automation/abi-check/previous-nss-release
+++ b/security/nss/automation/abi-check/previous-nss-release
@@ -1 +1 @@
-NSS_3_98_BRANCH
+NSS_3_99_BRANCH