mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: clear error queue after ignoring ssl_verify_cert_chain result.

Browse Source
This commit is contained in:
Bodo Möller 2000-05-27 22:25:01 +00:00
parent be06a9348d
commit 1fab73ac85
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGES
View File

@ -4,7 +4,13 @@
Changes between 0.9.5a and 0.9.6 [xx XXX 2000] Changes between 0.9.5a and 0.9.6 [xx XXX 2000]
*) EVP cipher enhancment. Add hooks for extra EVP features. This will allow *) In ssl/s2_clnt.c and ssl/s3_clnt.c, call ERR_clear_error() when
the handshake is continued after ssl_verify_cert_chain();
otherwise, if SSL_VERIFY_NONE is set, remaining error codes
can lead to 'unexplainable' connection aborts later.
[Bodo Moeller; problem tracked down by Lutz Jaenicke]
*) EVP cipher enhancement. Add hooks for extra EVP features. This will allow
various cipher parameters to be set in the EVP interface. Initially various cipher parameters to be set in the EVP interface. Initially
support added for variable key length ciphers via the support added for variable key length ciphers via the
EVP_CIPHER_CTX_set_key_length() function. Other cipher specific EVP_CIPHER_CTX_set_key_length() function. Other cipher specific

1
ssl/s2_clnt.c
View File

@ -920,6 +920,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); SSLerr(SSL_F_SSL2_SET_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED);
goto err; goto err;
} }
ERR_clear_error(); /* but we keep s->verify_result */
/* server's cert for this session */ /* server's cert for this session */
sc=ssl_sess_cert_new(); sc=ssl_sess_cert_new();

1
ssl/s3_clnt.c
View File

@ -764,6 +764,7 @@ static int ssl3_get_server_certificate(SSL *s)
SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED); SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED);
goto f_err; goto f_err;
} }
ERR_clear_error(); /* but we keep s->verify_result */
sc=ssl_sess_cert_new(); sc=ssl_sess_cert_new();
if (sc == NULL) goto err; if (sc == NULL) goto err;