backing out 575919285e2b, bug 1073330 NSS_3_18_BETA4
authorKai Engert <kaie@kuix.de>
Thu, 27 Nov 2014 23:05:47 +0100
changeset 11312 01c19c751a742cd382c121a33dac7c65cdb2fd50
parent 11311 a08de3bd0a611241bb45e9e8463b6b1ed800bdc4
child 11313 bdad06fd58ef6ba93147ba49a37e651040a0fb8d
push id520
push userkaie@kuix.de
push dateThu, 27 Nov 2014 22:06:23 +0000
bugs1073330
backing out 575919285e2b, bug 1073330
lib/nss/nss.def
lib/pk11wrap/pk11cert.c
lib/pk11wrap/pk11pub.h
--- 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:
--- a/lib/pk11wrap/pk11cert.c
+++ b/lib/pk11wrap/pk11cert.c
@@ -2681,19 +2681,8 @@ PK11_GetAllSlotsForCert(CERTCertificate 
 	PK11_FreeSlotList(slotList);
 	PORT_SetError(SEC_ERROR_NO_TOKEN);
 	slotList = NULL;
     }
 
     nssCryptokiObjectArray_Destroy(instances);
     return slotList;
 }
-
-SECStatus
-PK11_SetCertificateNickname(CERTCertificate *cert, const char *nickname)
-{
-    /* Can't set nickname of temp cert. */
-    if (!cert->slot || cert->pkcs11ID == CK_INVALID_HANDLE) {
-        return SEC_ERROR_INVALID_ARGS;
-    }
-    return PK11_SetObjectNickname(cert->slot, cert->pkcs11ID, nickname);
-}
-
--- a/lib/pk11wrap/pk11pub.h
+++ b/lib/pk11wrap/pk11pub.h
@@ -453,18 +453,16 @@ SECKEYPrivateKey * PK11_LoadPrivKey(PK11
 char * PK11_GetSymKeyNickname(PK11SymKey *symKey);
 char * PK11_GetPrivateKeyNickname(SECKEYPrivateKey *privKey);
 char * PK11_GetPublicKeyNickname(SECKEYPublicKey *pubKey);
 SECStatus PK11_SetSymKeyNickname(PK11SymKey *symKey, const char *nickname);
 SECStatus PK11_SetPrivateKeyNickname(SECKEYPrivateKey *privKey, 
 							const char *nickname);
 SECStatus PK11_SetPublicKeyNickname(SECKEYPublicKey *pubKey, 
 							const char *nickname);
-SECStatus PK11_SetCertificateNickname(CERTCertificate *cert,
-                                      const char *nickname);
 
 /* size to hold key in bytes */
 unsigned int PK11_GetKeyLength(PK11SymKey *key);
 /* size of actual secret parts of key in bits */
 /* algid is because RC4 strength is determined by the effective bits as well
  * as the key bits */
 unsigned int PK11_GetKeyStrength(PK11SymKey *key,SECAlgorithmID *algid);
 SECStatus PK11_ExtractKeyValue(PK11SymKey *symKey);