oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Try both the empty password and the NULL password (nothing vs the

Browse Source 
octet string \x00\x00).


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20656 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-05-10 21:37:44 +00:00
parent 668e539618
commit 324afe4009
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/hx509/crypto.c
View File

@@ -2143,11 +2143,13 @@ PBE_string2key(hx509_context context,
const EVP_MD *md) const EVP_MD *md)
{ {
PKCS12_PBEParams p12params; PKCS12_PBEParams p12params;
int passwordlen = strlen(password); int passwordlen;
hx509_crypto c; hx509_crypto c;
int iter, saltlen, ret; int iter, saltlen, ret;
unsigned char *salt; unsigned char *salt;
passwordlen = password ? strlen(password) : 0;
if (parameters == NULL) if (parameters == NULL)
return HX509_ALG_NOT_SUPP; return HX509_ALG_NOT_SUPP;
@@ -2164,10 +2166,6 @@ PBE_string2key(hx509_context context,
salt = p12params.salt.data; salt = p12params.salt.data;
saltlen = p12params.salt.length; saltlen = p12params.salt.length;
/* XXX It needs to be here, but why ? */
if (passwordlen == 0)
password = NULL;
if (!PKCS12_key_gen (password, passwordlen, salt, saltlen, if (!PKCS12_key_gen (password, passwordlen, salt, saltlen,
PKCS12_KEY_ID, iter, key->length, key->data, md)) { PKCS12_KEY_ID, iter, key->length, key->data, md)) {
ret = HX509_CRYPTO_INTERNAL_ERROR; ret = HX509_CRYPTO_INTERNAL_ERROR;
@@ -2288,8 +2286,10 @@ _hx509_pbe_decrypt(hx509_context context,
if (i < pw->len) if (i < pw->len)
password = pw->val[i]; password = pw->val[i];
else else if (i < pw->len + 1)
password = ""; password = "";
else
password = NULL;
ret = (*s2k)(context, password, ai->parameters, &crypto, ret = (*s2k)(context, password, ai->parameters, &crypto,
&key, &iv, enc_oid, md); &key, &iv, enc_oid, md);