summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorGiovanni Bechis <gbechis@apache.org>2023-03-30 17:09:09 +0000
committerGiovanni Bechis <gbechis@apache.org>2023-03-30 17:09:09 +0000
commitf766a83553ba39cd1d4ad552b735fb482defd0ff (patch)
treec7cace9f8bb6ea447dec6cdc395de4e7ede45c32 /modules
parent57c0ee9a6c2d501fafa2d3ed17244e6faf16dc35 (diff)
downloadhttpd-f766a83553ba39cd1d4ad552b735fb482defd0ff.tar.gz
check for more possible SSL failures
bz #66225 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908805 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
-rw-r--r--modules/ssl/ssl_engine_kernel.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 8a11cf4962..27c1d2383a 100644
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -997,10 +997,7 @@ static int ssl_hook_Access_classic(request_rec *r, SSLSrvConfigRec *sc, SSLDirCo
* handshake to proceed. */
modssl_set_reneg_state(sslconn, RENEG_ALLOW);
- SSL_renegotiate(ssl);
- SSL_do_handshake(ssl);
-
- if (!SSL_is_init_finished(ssl)) {
+ if(!SSL_renegotiate(ssl) || !SSL_do_handshake(ssl) || !SSL_is_init_finished(ssl)) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02225)
"Re-negotiation request failed");
ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, r->server);