Blame SOURCES/nss-softokn-fix-error-handling.patch
|
|
6fbbf4 |
diff -up ./nss/lib/softoken/pkcs11c.c.1154764 ./nss/lib/softoken/pkcs11c.c
|
|
|
6fbbf4 |
--- ./nss/lib/softoken/pkcs11c.c.1154764 2015-01-12 13:53:36.488856046 -0800
|
|
|
6fbbf4 |
+++ ./nss/lib/softoken/pkcs11c.c 2015-01-12 13:53:36.552856584 -0800
|
|
|
6fbbf4 |
@@ -3523,12 +3523,12 @@ nsc_parameter_gen(CK_KEY_TYPE key_type,
|
|
|
6fbbf4 |
}
|
|
|
6fbbf4 |
params->arena = arena;
|
|
|
6fbbf4 |
crv = sftk_Attribute2SSecItem(arena, ¶ms->prime, key, CKA_PRIME);
|
|
|
6fbbf4 |
- if (rv != SECSuccess) {
|
|
|
6fbbf4 |
+ if (crv != CKR_OK) {
|
|
|
6fbbf4 |
goto loser;
|
|
|
6fbbf4 |
}
|
|
|
6fbbf4 |
crv = sftk_Attribute2SSecItem(arena, ¶ms->subPrime,
|
|
|
6fbbf4 |
key, CKA_SUBPRIME);
|
|
|
6fbbf4 |
- if (crv != SECSuccess) {
|
|
|
6fbbf4 |
+ if (crv != CKR_OK) {
|
|
|
6fbbf4 |
goto loser;
|
|
|
6fbbf4 |
}
|
|
|
6fbbf4 |
|
|
|
6fbbf4 |
@@ -3544,7 +3544,7 @@ nsc_parameter_gen(CK_KEY_TYPE key_type,
|
|
|
6fbbf4 |
}
|
|
|
6fbbf4 |
vfy->arena = arena;
|
|
|
6fbbf4 |
crv = sftk_Attribute2SSecItem(arena, &vfy->seed, key, CKA_NSS_PQG_SEED);
|
|
|
6fbbf4 |
- if (rv != SECSuccess) {
|
|
|
6fbbf4 |
+ if (crv != CKR_OK) {
|
|
|
6fbbf4 |
goto loser;
|
|
|
6fbbf4 |
}
|
|
|
6fbbf4 |
crv = sftk_Attribute2SSecItem(arena, &vfy->h, key, CKA_NSS_PQG_H);
|