mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
Noticed in the development of fips-enabled mod_ssl, when we are
configured to support exactly one protocol, use that explicit server and client mechansim to handshake with the client or proxied machine, rather than the generic SSLv23_[client|server]_method(). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264621 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -409,14 +409,23 @@ static void ssl_init_ctx_protocol(server_rec *s,
|
|||||||
method = mctx->pkp ?
|
method = mctx->pkp ?
|
||||||
SSLv2_client_method() : /* proxy */
|
SSLv2_client_method() : /* proxy */
|
||||||
SSLv2_server_method(); /* server */
|
SSLv2_server_method(); /* server */
|
||||||
ctx = SSL_CTX_new(method); /* only SSLv2 is left */
|
|
||||||
}
|
}
|
||||||
else {
|
else if (protocol == SSL_PROTOCOL_SSLV3) {
|
||||||
|
method = mctx->pkp ?
|
||||||
|
SSLv3_client_method() : /* proxy */
|
||||||
|
SSLv3_server_method(); /* server */
|
||||||
|
}
|
||||||
|
else if (protocol == SSL_PROTOCOL_TLSV1) {
|
||||||
|
method = mctx->pkp ?
|
||||||
|
TLSv1_client_method() : /* proxy */
|
||||||
|
TLSv1_server_method(); /* server */
|
||||||
|
}
|
||||||
|
else { /* For multiple protocols, we need a flexible method */
|
||||||
method = mctx->pkp ?
|
method = mctx->pkp ?
|
||||||
SSLv23_client_method() : /* proxy */
|
SSLv23_client_method() : /* proxy */
|
||||||
SSLv23_server_method(); /* server */
|
SSLv23_server_method(); /* server */
|
||||||
ctx = SSL_CTX_new(method); /* be more flexible */
|
|
||||||
}
|
}
|
||||||
|
ctx = SSL_CTX_new(method);
|
||||||
|
|
||||||
mctx->ssl_ctx = ctx;
|
mctx->ssl_ctx = ctx;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user