diff options
| author | kris <kris@FreeBSD.org> | 2000-11-13 02:20:29 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-11-13 02:20:29 +0000 |
| commit | 76c54c9ba38450a69a291e1a8616ef6e229043ef (patch) | |
| tree | c19c2ee5abe6e2e8f31ea9f0df8dc01f357bb10a /crypto/openssl/ssl/s2_clnt.c | |
| parent | f6480205844e67624afaf36e515671962f3ff825 (diff) | |
| download | FreeBSD-src-76c54c9ba38450a69a291e1a8616ef6e229043ef.zip FreeBSD-src-76c54c9ba38450a69a291e1a8616ef6e229043ef.tar.gz | |
Resolve conflicts, and garbage collect some local changes that are no
longer required
Diffstat (limited to 'crypto/openssl/ssl/s2_clnt.c')
| -rw-r--r-- | crypto/openssl/ssl/s2_clnt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/s2_clnt.c b/crypto/openssl/ssl/s2_clnt.c index 5781f98..e448a60 100644 --- a/crypto/openssl/ssl/s2_clnt.c +++ b/crypto/openssl/ssl/s2_clnt.c @@ -922,6 +922,7 @@ int ssl2_set_certificate(SSL *s, int type, int len, unsigned char *data) SSLerr(SSL_F_SSL2_SET_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED); goto err; } + ERR_clear_error(); /* but we keep s->verify_result */ /* server's cert for this session */ sc=ssl_sess_cert_new(); |
