denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed broken smartcard support (bug #91)

Browse Source
This commit is contained in:
Andreas Steffen
2009-10-11 21:14:05 +02:00
parent 1c75e3404d
commit e8e2a147db
1 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pluto/ike_alg.c
+27 -3
View File
@@ -23,6 +23,8 @@
#include <library.h> #include <library.h>
#include <debug.h> #include <debug.h>
#include <credentials/keys/public_key.h>
#include <credentials/keys/private_key.h>
#include <crypto/hashers/hasher.h> #include <crypto/hashers/hasher.h>
#include <crypto/crypters/crypter.h> #include <crypto/crypters/crypter.h>
#include <crypto/prfs/prf.h> #include <crypto/prfs/prf.h>
@@ -193,20 +195,42 @@ struct db_context *ike_alg_db_new(connection_t *c, lset_t policy)
if (policy & POLICY_PUBKEY) if (policy & POLICY_PUBKEY)
{ {
int auth_method = 0; int auth_method = 0;
size_t key_size = 0;
key_type_t key_type = KEY_ANY;
if (c->spd.this.cert.type != CERT_NONE)
{
public_key_t *key = cert_get_public_key(c->spd.this.cert);
if (key == NULL)
{
plog("ike alg: unable to retrieve my public key");
continue;
}
key_type = key->get_type(key);
key_size = key->get_keysize(key);
key->destroy(key);
}
else
{
private_key_t *key = get_private_key(c); private_key_t *key = get_private_key(c);
if (key == NULL) if (key == NULL)
{ {
plog("ike alg: unable to locate my private key"); plog("ike alg: unable to retrieve my private key");
continue; continue;
} }
switch (key->get_type(key)) key_type = key->get_type(key);
key_size = key->get_keysize(key);
}
switch (key_type)
{ {
case KEY_RSA: case KEY_RSA:
auth_method = OAKLEY_RSA_SIG; auth_method = OAKLEY_RSA_SIG;
break; break;
case KEY_ECDSA: case KEY_ECDSA:
switch (key->get_keysize(key)) switch (key_size)
{ {
case 32: case 32:
auth_method = OAKLEY_ECDSA_256; auth_method = OAKLEY_ECDSA_256;