From 58f42841249c15477fbc8a99d256299dba10da7a Mon Sep 17 00:00:00 2001 From: "ian.mcgreer%sun.com" Date: Fri, 12 Apr 2002 18:07:49 +0000 Subject: bug 136806, don't authenticate to friendly slots when adding certs --- security/nss/cmd/certutil/certutil.c | 10 ++++++---- 1 file 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); -- cgit v1.2.1