summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjulien.pierre.boogz%sun.com <devnull@localhost>2008-02-12 23:38:38 +0000
committerjulien.pierre.boogz%sun.com <devnull@localhost>2008-02-12 23:38:38 +0000
commit0c54983b9fa112d4c9eee766e85e787d7d5606c9 (patch)
treeccb15e778bae5e75ebae02bdb252078e6815cb94
parent2d40b772faab8fc3f6878697cea0b7524cb5c480 (diff)
downloadnss-hg-0c54983b9fa112d4c9eee766e85e787d7d5606c9.tar.gz
Fix for bug 385946 . Can't import certificate into cert database in FIPS mode with certutil . r=rrelyea, nelson
-rw-r--r--security/nss/cmd/certutil/certutil.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/nss/cmd/certutil/certutil.c b/security/nss/cmd/certutil/certutil.c
index 609ef823b..387bd8722 100644
--- a/security/nss/cmd/certutil/certutil.c
+++ b/security/nss/cmd/certutil/certutil.c
@@ -355,7 +355,7 @@ AddCert(PK11SlotInfo *slot, CERTCertDBHandle *handle, char *name, char *trusts,
GEN_BREAK(SECFailure);
}
- if (!PK11_IsFriendly(slot)) {
+ if (PK11_IsFIPS() || !PK11_IsInternal(slot)) {
rv = PK11_Authenticate(slot, PR_TRUE, pwdata);
if (rv != SECSuccess) {
SECU_PrintError(progName, "could not authenticate to token or database");