aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2010-09-11 16:57:59 +0000
committerGreg Hudson <ghudson@mit.edu>2010-09-11 16:57:59 +0000
commite9dce022f833472af5852a163d19a7ebf85a1df9 (patch)
tree7d85094c8c9224e3d079df479ef0bdb61b68c4fb
parenta019d5a6010594bce4e5c80e33aa9ab85426dec4 (diff)
downloadkrb5-e9dce022f833472af5852a163d19a7ebf85a1df9.zip
krb5-e9dce022f833472af5852a163d19a7ebf85a1df9.tar.gz
krb5-e9dce022f833472af5852a163d19a7ebf85a1df9.tar.bz2
In the NSS mit_des_string_to_key_int, zero out pbe_params before
filling it in, to avoid passing uninitialized fields to PK11_RawPBEKeyGen. git-svn-id: svn://anonsvn.mit.edu/krb5/branches/nss@24305 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/lib/crypto/nss/des/string2key.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/crypto/nss/des/string2key.c b/src/lib/crypto/nss/des/string2key.c
index 27c5c9e..15c0add 100644
--- a/src/lib/crypto/nss/des/string2key.c
+++ b/src/lib/crypto/nss/des/string2key.c
@@ -54,6 +54,7 @@ mit_des_string_to_key_int(krb5_keyblock *key, const krb5_data *pw,
pwItem.data = (unsigned char *)pw->data;
pwItem.len = pw->length;
+ memset(&pbe_params, 0, sizeof(pbe_params));
pbe_params.pSalt = (unsigned char *)salt->data;
pbe_params.ulSaltLen = salt->length;
pbe_params.ulIteration = 1;