Issue #1338 - Part 2: Update NSS to 3.48-RTM

5 files changed, 14 insertions, 85 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 fa6e67412..e69de29bb 100644
--- a/security/nss/automation/abi-check/expected-report-libnss3.so.txt
+++ b/security/nss/automation/abi-check/expected-report-libnss3.so.txt
@@ -1,18 +0,0 @@
-
-1 function with some indirect sub-type change:
-
-  [C]'function SECStatus CERT_AddOCSPAcceptableResponses(CERTOCSPRequest*, SECOidTag, ...)' at ocsp.c:2203:1 has some indirect sub-type changes:
-    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
-        4 enumerator insertions:
-          '__anonymous_enum__::SEC_OID_X509_ANY_EXT_KEY_USAGE' value '357'
-          '__anonymous_enum__::SEC_OID_EXT_KEY_USAGE_IPSEC_IKE' value '358'
-          '__anonymous_enum__::SEC_OID_IPSEC_IKE_END' value '359'
-          '__anonymous_enum__::SEC_OID_IPSEC_IKE_INTERMEDIATE' value '360'
-
-        1 enumerator change:
-          '__anonymous_enum__::SEC_OID_TOTAL' from value '357' to '361' 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 971365c68..e69de29bb 100644
--- a/security/nss/automation/abi-check/expected-report-libnssutil3.so.txt
+++ b/security/nss/automation/abi-check/expected-report-libnssutil3.so.txt
@@ -1,18 +0,0 @@
-
-1 function with some indirect sub-type change:
-
-  [C]'function SECStatus NSS_GetAlgorithmPolicy(SECOidTag, PRUint32*)' at secoid.c:2217: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
-        4 enumerator insertions:
-          '__anonymous_enum__::SEC_OID_X509_ANY_EXT_KEY_USAGE' value '357'
-          '__anonymous_enum__::SEC_OID_EXT_KEY_USAGE_IPSEC_IKE' value '358'
-          '__anonymous_enum__::SEC_OID_IPSEC_IKE_END' value '359'
-          '__anonymous_enum__::SEC_OID_IPSEC_IKE_INTERMEDIATE' value '360'
-
-        1 enumerator change:
-          '__anonymous_enum__::SEC_OID_TOTAL' from value '357' to '361' 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 f4870feec..e69de29bb 100644
--- a/security/nss/automation/abi-check/expected-report-libsmime3.so.txt
+++ b/security/nss/automation/abi-check/expected-report-libsmime3.so.txt
@@ -1,48 +0,0 @@
-
-1 function with some indirect sub-type change:
-
-  [C]'function PK11SymKey* NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo*)' at cmscinfo.c:363:1 has some indirect sub-type changes:
-    parameter 1 of type 'NSSCMSContentInfo*' has sub-type changes:
-      in pointed to type 'typedef NSSCMSContentInfo' at cmst.h:54:1:
-        underlying type 'struct NSSCMSContentInfoStr' at cmst.h:126:1 changed:
-          type size hasn't changed
-          1 data member changes (2 filtered):
-           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):
-                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:
-                      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:
-                               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:513: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
-                                           4 enumerator insertions:
-                                             '__anonymous_enum__::SEC_OID_X509_ANY_EXT_KEY_USAGE' value '357'
-                                             '__anonymous_enum__::SEC_OID_EXT_KEY_USAGE_IPSEC_IKE' value '358'
-                                             '__anonymous_enum__::SEC_OID_IPSEC_IKE_END' value '359'
-                                             '__anonymous_enum__::SEC_OID_IPSEC_IKE_INTERMEDIATE' value '360'
-
-                                           1 enumerator change:
-                                             '__anonymous_enum__::SEC_OID_TOTAL' from value '357' to '361' at secoidt.h:34:1
-
-
-
-
-
-
-
-
diff --git a/security/nss/automation/abi-check/expected-report-libssl3.so.txt b/security/nss/automation/abi-check/expected-report-libssl3.so.txt
index e69de29bb..bf902d170 100644
--- a/security/nss/automation/abi-check/expected-report-libssl3.so.txt
+++ b/security/nss/automation/abi-check/expected-report-libssl3.so.txt
@@ -0,0 +1,13 @@
+
+1 function with some indirect sub-type change:
+
+  [C]'function SECStatus SSL_GetPreliminaryChannelInfo(PRFileDesc*, SSLPreliminaryChannelInfo*, PRUintn)' at sslinfo.c:113:1 has some indirect sub-type changes:
+    parameter 2 of type 'SSLPreliminaryChannelInfo*' has sub-type changes:
+      in pointed to type 'typedef SSLPreliminaryChannelInfo' at sslt.h:424:1:
+        underlying type 'struct SSLPreliminaryChannelInfoStr' at sslt.h:373:1 changed:
+          type size changed from 192 to 288 (in bits)
+          3 data member insertions:
+            'PRBool SSLPreliminaryChannelInfoStr::peerDelegCred', at offset 192 (in bits) at sslt.h:418:1
+            'PRUint32 SSLPreliminaryChannelInfoStr::authKeyBits', at offset 224 (in bits) at sslt.h:419:1
+            'SSLSignatureScheme SSLPreliminaryChannelInfoStr::signatureScheme', at offset 256 (in bits) at sslt.h:420:1
+
diff --git a/security/nss/automation/abi-check/previous-nss-release b/security/nss/automation/abi-check/previous-nss-release
index 13a0361e3..29989e5f3 100644
--- a/security/nss/automation/abi-check/previous-nss-release
+++ b/security/nss/automation/abi-check/previous-nss-release
@@ -1 +1 @@
-NSS_3_40_BRANCH
+NSS_3_47_BRANCH