diff options
| author | nectar <nectar@FreeBSD.org> | 2003-10-01 12:32:41 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2003-10-01 12:32:41 +0000 |
| commit | ee25ce74b3f6742c1079590363995e56ff51b014 (patch) | |
| tree | 69b3ffc611270d72c473248fe700c2942eb5e6b5 /crypto/openssl/ssl/ssl_rsa.c | |
| parent | 5d79b842c13e718f85a9f2e1676e361b6fc55367 (diff) | |
| download | FreeBSD-src-ee25ce74b3f6742c1079590363995e56ff51b014.zip FreeBSD-src-ee25ce74b3f6742c1079590363995e56ff51b014.tar.gz | |
Vendor import of OpenSSL 0.9.7c
Diffstat (limited to 'crypto/openssl/ssl/ssl_rsa.c')
| -rw-r--r-- | crypto/openssl/ssl/ssl_rsa.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/ssl_rsa.c b/crypto/openssl/ssl/ssl_rsa.c index 03828b6..3303905 100644 --- a/crypto/openssl/ssl/ssl_rsa.c +++ b/crypto/openssl/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); |
