diff options
| author |   markus <markus@openbsd.org> | 2003-11-11 22:15:18 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2003-11-11 22:15:18 +0000 |
| commit | cdc51833b6c06c4d2bb61dab574d6d6c40e4a806 (patch) | |
| tree | f9fc9a67a1a98fe5ec5af41fc8a54135caae46f8 /lib/libssl/src/ssl/ssl_rsa.c | |
| parent | import 0.9.7c (diff) | |
| download | wireguard-openbsd-cdc51833b6c06c4d2bb61dab574d6d6c40e4a806.tar.xz wireguard-openbsd-cdc51833b6c06c4d2bb61dab574d6d6c40e4a806.zip | |
merge 0.9.7c; minor bugsfixes;
API addition: ERR_release_err_state_table
[make includes before you build libssl/libcrypto]
Diffstat (limited to 'lib/libssl/src/ssl/ssl_rsa.c')
| -rw-r--r-- | lib/libssl/src/ssl/ssl_rsa.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libssl/src/ssl/ssl_rsa.c b/lib/libssl/src/ssl/ssl_rsa.c index 03828b66326..330390519bb 100644 --- a/lib/libssl/src/ssl/ssl_rsa.c +++ b/lib/libssl/src/ssl/ssl_rsa.c @@ -207,7 +207,7 @@ static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey) ok=1; else #endif - if (!X509_check_private_key(c->pkeys[i].x509,pkey)) + if (!X509_check_private_key(c->pkeys[i].x509,pkey)) { if ((i == SSL_PKEY_DH_RSA) || (i == SSL_PKEY_DH_DSA)) { @@ -241,6 +241,8 @@ static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey) return(0); } + ERR_clear_error(); /* make sure no error from X509_check_private_key() + * is left if we have chosen to ignore it */ if (c->pkeys[i].privatekey != NULL) EVP_PKEY_free(c->pkeys[i].privatekey); CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY); |