Bugzilla bug 129408: final adjustments of the NSS 3.4 *.def files. List

the symbols in alphabetical order.  In softokn.def, changed "Sofoken 3.4
release" to "NSS 3.4 release, which is what we use in other *.def files.
Added seven new PKCS7 exports to smime.def.  r=relyea
Modified files: nss.def smime.def softokn.def ssl.def

4 files changed, 29 insertions, 25 deletions

diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def
index 174a7c1f1..e3201fe54 100644
--- a/security/nss/lib/nss/nss.def
+++ b/security/nss/lib/nss/nss.def
@@ -588,8 +588,8 @@ CERT_FindUserCertsByUsage;
 CERT_GetCertChainFromCert;
 CERT_GetOCSPAuthorityInfoAccessLocation;
 CERT_KeyFromDERCrl;
-CERT_NicknameStringsFromCertList;
 CERT_MakeCANickname;
+CERT_NicknameStringsFromCertList;
 CERT_VerifySignedData;
 DER_Encode;
 HASH_Begin;
@@ -632,25 +632,25 @@ NSS_Get_SEC_NullTemplate;
 NSS_Get_SEC_SignedCertificateTemplate;
 NSS_Get_SEC_UTF8StringTemplate;
 ;+# for JSS
-PK11_ImportDERPrivateKeyInfoAndReturnKey;
-PK11_ImportPublicKey;
-PK11_ImportPrivateKeyInfoAndReturnKey;
-PK11_ImportSymKeyWithFlags;
-PK11_ListPublicKeysInSlot;
-PK11_ListPrivKeysInSlot;
-PK11_ListFixedKeysInSlot;
 PK11_DeleteTokenPrivateKey;
 PK11_DeleteTokenPublicKey;
 PK11_DeleteTokenSymKey;
 PK11_GetNextSymKey;
 PK11_GetPQGParamsFromPrivateKey;
-PK11_GetPublicKeyNickname;
 PK11_GetPrivateKeyNickname;
+PK11_GetPublicKeyNickname;
 PK11_GetSymKeyNickname;
+PK11_ImportDERPrivateKeyInfoAndReturnKey;
+PK11_ImportPrivateKeyInfoAndReturnKey;
+PK11_ImportPublicKey;
+PK11_ImportSymKeyWithFlags;
+PK11_ListFixedKeysInSlot;
+PK11_ListPrivKeysInSlot;
+PK11_ListPublicKeysInSlot;
 PK11_ProtectedAuthenticationPath;
-PK11_SetSymKeyNickname;
-PK11_SetPublicKeyNickname;
 PK11_SetPrivateKeyNickname;
+PK11_SetPublicKeyNickname;
+PK11_SetSymKeyNickname;
 SECKEY_DecodeDERSubjectPublicKeyInfo;
 SECKEY_DestroyPublicKeyList;
 ;+# for debugging
diff --git a/security/nss/lib/smime/smime.def b/security/nss/lib/smime/smime.def
index 1657a3061..fd465333d 100644
--- a/security/nss/lib/smime/smime.def
+++ b/security/nss/lib/smime/smime.def
@@ -175,7 +175,7 @@ NSSSMIME_VersionCheck;
 ;+    local:
 ;+        *;
 ;+};
-;+NSS_3.3 {     # NSS 3.3. release
+;+NSS_3.3 {     # NSS 3.3 release
 ;+    global:
 SEC_PKCS7AddCertificate;
 SEC_PKCS7CreateCertsOnly;
@@ -183,14 +183,21 @@ SEC_PKCS7Encode;
 ;+    local:
 ;+       *;
 ;+};
-;+NSS_3.4 {     # NSS 3.4. release
+;+NSS_3.4 {     # NSS 3.4 release
 ;+    global:
 ;+# FOR PSM
 CERT_DecodeCertFromPackage;
-NSS_CMSSignedData_SetDigestValue;
 NSS_CMSMessage_IsSigned;
+NSS_CMSSignedData_SetDigestValue;
 NSS_SMIMESignerInfo_SaveSMIMEProfile;
+SEC_PKCS7ContainsCertsOrCrls;
+SEC_PKCS7ContentIsEncrypted;
+SEC_PKCS7ContentIsSigned;
 SEC_PKCS7CopyContentInfo;
+SEC_PKCS7GetSignerCommonName;
+SEC_PKCS7GetSignerEmailAddress;
+SEC_PKCS7GetSigningTime;
+SEC_PKCS7SetContent;
 SEC_PKCS7VerifyDetachedSignature;
 SECMIME_DecryptionAllowed;
 ;+    local:
diff --git a/security/nss/lib/softoken/softokn.def b/security/nss/lib/softoken/softokn.def
index ef5e51e77..d851aa34d 100644
--- a/security/nss/lib/softoken/softokn.def
+++ b/security/nss/lib/softoken/softokn.def
@@ -44,14 +44,14 @@
 ;+#    And for AIX, the first ";" will also be removed.
 ;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
 ;+#   directives are hidden behind ";", ";+", and ";-"
-;+SOFTOKEN_3.4 {       # Softoken 3.4 release
+;+NSS_3.4 {       # NSS 3.4 release
 ;+    global:
 LIBRARY softokn3 ;-
-EXPORTS		;-
-NSC_GetFunctionList ;
-NSC_ModuleDBFunc ;
-FC_GetFunctionList  ;
-C_GetFunctionList  ; Make this function like a real PKCS #11 module as well
+EXPORTS ;-
+C_GetFunctionList; Make this function like a real PKCS #11 module as well
+FC_GetFunctionList;
+NSC_GetFunctionList;
+NSC_ModuleDBFunc;
 ;+    local:
 ;+       *;
 ;+};
diff --git a/security/nss/lib/ssl/ssl.def b/security/nss/lib/ssl/ssl.def
index 89e23dde3..7833ae741 100644
--- a/security/nss/lib/ssl/ssl.def
+++ b/security/nss/lib/ssl/ssl.def
@@ -107,14 +107,11 @@ NSSSSL_VersionCheck;
 ;+};
 ;+NSS_3.4 {         # NSS 3.4   release
 ;+    global:
-;+#   We have not yet decided whether these functions will be exported
-;+#   in the final 3.4 release, so please treat them as exported private
-;+#   functions for now.
-SSL_GetMaxServerCacheLocks;
-SSL_SetMaxServerCacheLocks;
 SSL_GetChannelInfo;
 SSL_GetCipherSuiteInfo;
+SSL_GetMaxServerCacheLocks;
 SSL_LocalCertificate;
+SSL_SetMaxServerCacheLocks;
 ;+    local:
 ;+*;
 ;+};