diff options
| author | nelson%bolyard.com <devnull@localhost> | 2009-03-31 21:03:49 +0000 |
|---|---|---|
| committer | nelson%bolyard.com <devnull@localhost> | 2009-03-31 21:03:49 +0000 |
| commit | 4ffe6848c044bcb4f2ab712129444aa6b4d61b4f (patch) | |
| tree | d372674bd3fca86d1033af55a032a388122cc375 | |
| parent | 4fbfb0f38317d7e7c33c9227f99aea15a9ff87ac (diff) | |
| download | nss-hg-4ffe6848c044bcb4f2ab712129444aa6b4d61b4f.tar.gz | |
Bug 486060: sec_asn1d_parse_leaf uses argument uninitialized by caller pbe_PK11AlgidToParam
r=rrelyea
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11pbe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/nss/lib/pk11wrap/pk11pbe.c b/security/nss/lib/pk11wrap/pk11pbe.c index fa35f02e3..987428654 100644 --- a/security/nss/lib/pk11wrap/pk11pbe.c +++ b/security/nss/lib/pk11wrap/pk11pbe.c @@ -790,13 +790,13 @@ pbe_PK11AlgidToParam(SECAlgorithmID *algid,SECItem *mech) /* * decode the algid based on the pbe type */ + PORT_Memset(&p5_param, 0, sizeof(p5_param)); if (sec_pkcs5_is_algorithm_v2_pkcs12_algorithm(algorithm)) { iv_len = PK11_GetIVLength(PK11_AlgtagToMechanism(algorithm)); rv = SEC_ASN1DecodeItem(arena, &p5_param, SEC_V2PKCS12PBEParameterTemplate, &algid->parameters); } else if (algorithm == SEC_OID_PKCS5_PBKDF2) { iv_len = 0; - PORT_Memset(&p5_param, 0, sizeof(p5_param)); rv = SEC_ASN1DecodeItem(arena,&p5_param, SEC_PKCS5V2PBEParameterTemplate, &algid->parameters); } else { |