From: Martin Willi <martin@revosec.ch>
Date: Mon, 30 Aug 2010 08:14:45 +0000 (+0200)
Subject: Fixed pluto smartcard support after introducing encryption schemes
X-Git-Tag: 4.5.0~389
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45684ee65c997dd87936525d5b13a4a967658703;p=thirdparty%2Fstrongswan.git

Fixed pluto smartcard support after introducing encryption schemes
---

diff --git a/src/pluto/smartcard.c b/src/pluto/smartcard.c
index f1a3932a67..7230134843 100644
--- a/src/pluto/smartcard.c
+++ b/src/pluto/smartcard.c
@@ -1078,7 +1078,7 @@ cert_t* scx_load_cert(const char *filename, smartcard_t **scp, bool *cached)
 	*scp = sc = scx_add(scx_parse_number_slot_id(number_slot_id));
 
 	/* is there a cached smartcard certificate? */
-	*cached = sc->last_cert && 
+	*cached = sc->last_cert &&
 			  (time(NULL) - sc->last_load) < SCX_CERT_CACHE_INTERVAL;
 
 	if (*cached)
@@ -1451,7 +1451,7 @@ bool scx_encrypt(smartcard_t *sc, const u_char *in, size_t inlen, u_char *out,
 			{
 				return FALSE;
 			}
-			key->encrypt(key, plain_text, &cipher_text);
+			key->encrypt(key, ENCRYPT_RSA_PKCS1, plain_text, &cipher_text);
 			key->destroy(key);
 
 			if (cipher_text.ptr == NULL)