summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtchang%redhat.com <devnull@localhost>2006-07-31 18:32:06 +0000
committerwtchang%redhat.com <devnull@localhost>2006-07-31 18:32:06 +0000
commitba04dea249262d6e60fb738809fe1c8399c3a987 (patch)
treed1675376094fda92997ee6cdc0218e9669269736
parent02a8c554310bccf7c44696b0eba38a9dc32cf76d (diff)
downloadnss-hg-NSS_3_11_20060731_TAG.tar.gz
Bugzilla Bug 336509: put the FIPS token in the Error state only when theNSS_3_11_20060731_TAG
continuous RNG test fails. Tag: NSS_3_11_BRANCH
-rw-r--r--security/nss/lib/softoken/pkcs11.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/security/nss/lib/softoken/pkcs11.c b/security/nss/lib/softoken/pkcs11.c
index 5e63f7463..824938583 100644
--- a/security/nss/lib/softoken/pkcs11.c
+++ b/security/nss/lib/softoken/pkcs11.c
@@ -1537,8 +1537,10 @@ sftk_GenerateSecretCKA_ID(NSSLOWKEYDBHandle *handle, SECItem *id, char *label)
(++retries <= SFTK_KEY_MAX_RETRIES));
if ((rv != SECSuccess) || (retries > SFTK_KEY_MAX_RETRIES)) {
+ if (rv != SECSuccess) {
+ sftk_fatalError = PR_TRUE;
+ }
crv = CKR_DEVICE_ERROR; /* random number generator is bad */
- sftk_fatalError = PR_TRUE;
PORT_Free(id->data);
id->data = NULL;
id->len = 0;