diff options
| author | Kai Engert <kaie@kuix.de> | 2014-11-27 23:05:47 +0100 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2014-11-27 23:05:47 +0100 |
| commit | 13e42bc86cfee2efea3f9e30c6d5024eb25c0ec9 (patch) | |
| tree | 4451c00517487777a08adf86ebdc2cae633b8c2e | |
| parent | ec2b0d0e611a1e9bfd6c0bf7d2c4c18fd55f4a57 (diff) | |
| download | nss-hg-NSS_3_18_BETA4.tar.gz | |
backing out 575919285e2b, bug 1073330NSS_3_18_BETA4
| -rw-r--r-- | lib/nss/nss.def | 1 | ||||
| -rw-r--r-- | lib/pk11wrap/pk11cert.c | 11 | ||||
| -rw-r--r-- | lib/pk11wrap/pk11pub.h | 2 |
3 files changed, 0 insertions, 14 deletions
diff --git a/lib/nss/nss.def b/lib/nss/nss.def index 23fb5e393..6f6b67081 100644 --- a/lib/nss/nss.def +++ b/lib/nss/nss.def @@ -622,7 +622,6 @@ PK11_ListFixedKeysInSlot; PK11_ListPrivKeysInSlot; PK11_ListPublicKeysInSlot; PK11_ProtectedAuthenticationPath; -PK11_SetCertificateNickname; PK11_SetPrivateKeyNickname; PK11_SetPublicKeyNickname; PK11_SetSymKeyNickname; diff --git a/lib/pk11wrap/pk11cert.c b/lib/pk11wrap/pk11cert.c index c4250c64d..29addd8be 100644 --- a/lib/pk11wrap/pk11cert.c +++ b/lib/pk11wrap/pk11cert.c @@ -2686,14 +2686,3 @@ PK11_GetAllSlotsForCert(CERTCertificate *cert, void *arg) 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); -} - diff --git a/lib/pk11wrap/pk11pub.h b/lib/pk11wrap/pk11pub.h index 709ce21e2..f0bf2c882 100644 --- a/lib/pk11wrap/pk11pub.h +++ b/lib/pk11wrap/pk11pub.h @@ -458,8 +458,6 @@ 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); |