summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Jacobs <kjacobs@mozilla.com>2020-05-28 22:34:52 +0000
committerKevin Jacobs <kjacobs@mozilla.com>2020-05-28 22:34:52 +0000
commit583df795ea88279ab7d383166f3a1af0504cd42a (patch)
tree2793d5eab169ea9b8cda8a425b620787289e55a7
parent3ec166d77d25cb845a87994b71d53d7227bffacf (diff)
downloadnss-hg-583df795ea88279ab7d383166f3a1af0504cd42a.tar.gz
Bug 1640260 - Initialize PBE params r=jcjNSS_3_53_BETA2
Differential Revision: https://phabricator.services.mozilla.com/D76544
-rw-r--r--lib/softoken/pkcs11c.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/softoken/pkcs11c.c b/lib/softoken/pkcs11c.c
index 78d8677cc..9777829f5 100644
--- a/lib/softoken/pkcs11c.c
+++ b/lib/softoken/pkcs11c.c
@@ -4464,6 +4464,7 @@ NSC_GenerateKey(CK_SESSION_HANDLE hSession,
CK_OBJECT_CLASS objclass = CKO_SECRET_KEY;
CK_RV crv = CKR_OK;
CK_BBOOL cktrue = CK_TRUE;
+ NSSPKCS5PBEParameter *pbe_param = NULL;
int i;
SFTKSlot *slot = sftk_SlotFromSessionHandle(hSession);
unsigned char buf[MAX_KEY_LEN];
@@ -4472,7 +4473,6 @@ NSC_GenerateKey(CK_SESSION_HANDLE hSession,
nsc_bulk,
nsc_param,
nsc_jpake } key_gen_type;
- NSSPKCS5PBEParameter *pbe_param;
SSL3RSAPreMasterSecret *rsa_pms;
CK_VERSION *version;
/* in very old versions of NSS, there were implementation errors with key