(_hx509_pbe_decrypt): try all passwords, not just the first one.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16852 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1473,9 +1473,8 @@ _hx509_pbe_decrypt(hx509_context context,
|
|||||||
|
|
||||||
ret = (*s2k)(context, password, ai->parameters, &crypto,
|
ret = (*s2k)(context, password, ai->parameters, &crypto,
|
||||||
&key, &iv, enc_oid, md);
|
&key, &iv, enc_oid, md);
|
||||||
if (ret) {
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
|
||||||
|
|
||||||
ret = hx509_crypto_decrypt(crypto,
|
ret = hx509_crypto_decrypt(crypto,
|
||||||
econtent->data,
|
econtent->data,
|
||||||
@@ -1483,7 +1482,7 @@ _hx509_pbe_decrypt(hx509_context context,
|
|||||||
&iv,
|
&iv,
|
||||||
content);
|
content);
|
||||||
hx509_crypto_destroy(crypto);
|
hx509_crypto_destroy(crypto);
|
||||||
if (ret)
|
if (ret == 0)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user