Bug 1073330 - Support set nickname of imported certificates, fix version of new exported symbol, tbr=rrelyea
authorKai Engert <kaie@kuix.de>
Mon, 20 Oct 2014 23:05:27 +0200
changeset 11296 7f496fc97e755660a6be823d5baaae6fad643e63
parent 11295 575919285e2bc440659c585c0a0ed219ce60fda6
child 11297 1882a6db68fd34cd907e3c3fa398455f15b80784
push id507
push userkaie@kuix.de
push dateMon, 20 Oct 2014 21:05:51 +0000
bugs1073330
Bug 1073330 - Support set nickname of imported certificates, fix version of new exported symbol, tbr=rrelyea
lib/nss/nss.def
--- a/lib/nss/nss.def
+++ b/lib/nss/nss.def
@@ -617,17 +617,16 @@ PK11_GetSymKeyNickname;
 PK11_ImportDERPrivateKeyInfoAndReturnKey;
 PK11_ImportPrivateKeyInfoAndReturnKey;
 PK11_ImportPublicKey;
 PK11_ImportSymKeyWithFlags;
 PK11_ListFixedKeysInSlot;
 PK11_ListPrivKeysInSlot;
 PK11_ListPublicKeysInSlot;
 PK11_ProtectedAuthenticationPath;
-PK11_SetCertificateNickname;
 PK11_SetPrivateKeyNickname;
 PK11_SetPublicKeyNickname;
 PK11_SetSymKeyNickname;
 SECKEY_DecodeDERSubjectPublicKeyInfo;
 SECKEY_DestroyPublicKeyList;
 ;+# for debugging
 nss_DumpCertificateCacheInfo;
 ;+    local:
@@ -1058,8 +1057,14 @@ SECMOD_InternaltoPubMechFlags;
 ;+    global:
 CERT_AddExtensionByOID;
 CERT_GetGeneralNameTypeFromString;
 PK11_PubEncrypt;
 PK11_PrivDecrypt;
 ;+    local:
 ;+       *;
 ;+};
+;+NSS_3.18 { 	# NSS 3.18 release
+;+    global:
+PK11_SetCertificateNickname;
+;+    local:
+;+       *;
+;+};