]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
Fixed pluto smartcard support after introducing encryption schemes
authorMartin Willi <martin@revosec.ch>
Mon, 30 Aug 2010 08:14:45 +0000 (10:14 +0200)
committerMartin Willi <martin@revosec.ch>
Mon, 30 Aug 2010 08:14:45 +0000 (10:14 +0200)
src/pluto/smartcard.c

index f1a3932a67e2f6050ede1e049b83bf3a77eeb2f0..7230134843f660bb0f372a1b452c689ca002f5c7 100644 (file)
@@ -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)