diff options
| author | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2004-06-24 15:58:59 +0000 |
|---|---|---|
| committer | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2004-06-24 15:58:59 +0000 |
| commit | 341ee965e2d72d2beab24d3f402b0e2f7c243925 (patch) | |
| tree | 9278af56fff62c251ff2e108dd67349650c31a9a | |
| parent | ce195f67911b86f313d9e5aa863e97213322fa40 (diff) | |
Also handle keys from x509-certificates embedded in keynote credentials.
with msf@
ok ho@
| -rw-r--r-- | sbin/isakmpd/policy.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sbin/isakmpd/policy.c b/sbin/isakmpd/policy.c index c9ff0eab6d5..b20c9841e5c 100644 --- a/sbin/isakmpd/policy.c +++ b/sbin/isakmpd/policy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: policy.c,v 1.75 2004/06/20 15:24:05 ho Exp $ */ +/* $OpenBSD: policy.c,v 1.76 2004/06/24 15:58:58 hshoexer Exp $ */ /* $EOM: policy.c,v 1.49 2000/10/24 13:33:39 niklas Exp $ */ /* @@ -2264,7 +2264,8 @@ keynote_cert_get_key(void *scert, void *keyp) kl = kn_get_licensees(kid, sid); while (kl) { - if (kl->key_alg == KEYNOTE_ALGORITHM_RSA) { + if (kl->key_alg == KEYNOTE_ALGORITHM_RSA || + kl->key_alg == KEYNOTE_ALGORITHM_X509) { *(RSA **)keyp = RSAPublicKey_dup(kl->key_key); break; } |