From 1f4452b34e28e8396db78fff549e5e71f75c0ba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Sat, 9 Dec 2006 12:13:21 +0000
Subject: [PATCH] (try_decrypt): pass down AlgorithmIdentifier that key uses to
 do sigatures 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
---
 lib/hx509/ks_file.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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