www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Prevent segfaults after SSL renegotiation failures.

Browse Source 
* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): Set aborted flag
after renegotiation failure.

* modules/ssl/ssl_engine_io.c (ssl_filter_write, ssl_io_filter_output):
Don't dereference BIOs in filter_ctx when filter_ctx->pssl is NULL.
(ssl_filter_io_shutdown): Set aborted flag on abortive shutdown.

PR: 21370
Submitted by: Hartmut Keil <Hartmut.Keil@adnovum.ch>
Cleaned up by: Jeff Trawick, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100720 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2003-07-21 12:02:40 +00:00
parent 6d5e39b8f7
commit eb49ea1f5c
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ssl/ssl_engine_kernel.c
View File

@@ -706,6 +706,7 @@ int ssl_hook_Access(request_rec *r)
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
"Re-negotiation request failed");
r->connection->aborted = 1;
return HTTP_FORBIDDEN;
}
@@ -724,6 +725,7 @@ int ssl_hook_Access(request_rec *r)
"Re-negotiation handshake failed: "
"Not accepted by client!?");
r->connection->aborted = 1;
return HTTP_FORBIDDEN;
}
}