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

(try_decrypt): pass down AlgorithmIdentifier that key uses to do sigatures

Browse Source 
so there is no need to hardcode RSA into this function.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19299 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-12-09 12:13:21 +00:00
parent 6f0d8af9a6
commit 1f4452b34e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/hx509/ks_file.c
View File

@@ -129,6 +129,7 @@ parse_certificate(hx509_context context, const char *fn,
static int static int
try_decrypt(hx509_context context, try_decrypt(hx509_context context,
struct hx509_collector *collector, struct hx509_collector *collector,
const AlgorithmIdentifier *alg,
const EVP_CIPHER *c, const EVP_CIPHER *c,
const void *ivdata, const void *ivdata,
const void *password, const void *password,
@@ -177,7 +178,7 @@ try_decrypt(hx509_context context,
ret = _hx509_collector_private_key_add(context, ret = _hx509_collector_private_key_add(context,
collector, collector,
hx509_signature_rsa(), alg,
NULL, NULL,
&clear, &clear,
NULL); NULL);
@@ -286,8 +287,8 @@ parse_rsa_private_key(hx509_context context, const char *fn,
password = pw->val[i]; password = pw->val[i];
passwordlen = strlen(password); passwordlen = strlen(password);
ret = try_decrypt(context, c, cipher, ret = try_decrypt(context, c, hx509_signature_rsa(),
ivdata, password, passwordlen, cipher, ivdata, password, passwordlen,
data, len); data, len);
if (ret == 0) { if (ret == 0) {
decrypted = 1; decrypted = 1;
@@ -308,8 +309,8 @@ parse_rsa_private_key(hx509_context context, const char *fn,
ret = hx509_lock_prompt(lock, &prompt); ret = hx509_lock_prompt(lock, &prompt);
if (ret == 0) if (ret == 0)
ret = try_decrypt(context, c, cipher, ret = try_decrypt(context, c, hx509_signature_rsa(),
ivdata, password, strlen(password), cipher, ivdata, password, strlen(password),
data, len); data, len);
/* XXX add password to lock password collection ? */ /* XXX add password to lock password collection ? */
memset(password, 0, sizeof(password)); memset(password, 0, sizeof(password));