mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update from stable branch.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2008-06-18 15:08:41 +00:00
parent 46d4782888
commit 2836cb3816
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/e_capi.c
View File

@ -70,6 +70,7 @@
#include <openssl/engine.h> #include <openssl/engine.h>
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/x509v3.h>
#include "e_capi_err.h" #include "e_capi_err.h"
#include "e_capi_err.c" #include "e_capi_err.c"
@ -1367,7 +1368,6 @@ static CAPI_KEY *capi_get_key(CAPI_CTX *ctx, const char *contname, char *provnam
{ {
CAPI_KEY *key; CAPI_KEY *key;
key = OPENSSL_malloc(sizeof(CAPI_KEY)); key = OPENSSL_malloc(sizeof(CAPI_KEY));
contname, provname, ptype);
CAPI_trace(ctx, "capi_get_key, contname=%s, provname=%s, type=%d\n", CAPI_trace(ctx, "capi_get_key, contname=%s, provname=%s, type=%d\n",
contname, provname, ptype); contname, provname, ptype);
if (!CryptAcquireContext(&key->hprov, contname, provname, ptype, 0)) if (!CryptAcquireContext(&key->hprov, contname, provname, ptype, 0))
@ -1587,11 +1587,15 @@ static int capi_load_ssl_client_cert(ENGINE *e, SSL *ssl,
CAPI_trace(ctx, "Can't Parse Certificate %d\n", i); CAPI_trace(ctx, "Can't Parse Certificate %d\n", i);
continue; continue;
} }
if (cert_issuer_match(ca_dn, x)) if (cert_issuer_match(ca_dn, x)
&& X509_check_purpose(x, X509_PURPOSE_SSL_CLIENT, 0))
{ {
key = capi_get_cert_key(ctx, cert); key = capi_get_cert_key(ctx, cert);
if (!key) if (!key)
{
X509_free(x);
continue; continue;
}
/* Match found: attach extra data to it so /* Match found: attach extra data to it so
* we can retrieve the key later. * we can retrieve the key later.
*/ */