diff options
| author | ian.mcgreer%sun.com <devnull@localhost> | 2002-04-12 18:07:49 +0000 |
|---|---|---|
| committer | ian.mcgreer%sun.com <devnull@localhost> | 2002-04-12 18:07:49 +0000 |
| commit | 58f42841249c15477fbc8a99d256299dba10da7a (patch) | |
| tree | 07b73cdcc98c68533e5c0dddd185f3c39df24ae5 | |
| parent | df3c1405447b784a75b77819dd58676738256df8 (diff) | |
| download | nss-hg-58f42841249c15477fbc8a99d256299dba10da7a.tar.gz | |
bug 136806, don't authenticate to friendly slots when adding certs
| -rw-r--r-- | security/nss/cmd/certutil/certutil.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/security/nss/cmd/certutil/certutil.c b/security/nss/cmd/certutil/certutil.c index 4c431861d..291a877dd 100644 --- a/security/nss/cmd/certutil/certutil.c +++ b/security/nss/cmd/certutil/certutil.c @@ -340,10 +340,12 @@ AddCert(PK11SlotInfo *slot, CERTCertDBHandle *handle, char *name, char *trusts, if ( emailcert ) CERT_SaveSMimeProfile(tempCert, NULL, NULL); #else - rv = PK11_Authenticate(slot, PR_TRUE, pwdata); - if (rv != SECSuccess) { - SECU_PrintError(progName, "could authenticate to token or database"); - GEN_BREAK(SECFailure); + if (!PK11_IsFriendly(slot)) { + rv = PK11_Authenticate(slot, PR_TRUE, pwdata); + if (rv != SECSuccess) { + SECU_PrintError(progName, "could authenticate to token or database"); + GEN_BREAK(SECFailure); + } } rv = PK11_ImportCert(slot, cert, CK_INVALID_HANDLE, name, PR_FALSE); |