mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
Streamline ephemeral key handling:
- drop support for ephemeral RSA keys (only allowed/needed for export ciphers) - drop pTmpKeys from the per-process SSLModConfigRec, and remove the temp key generation at startup (unnecessary for DHE/ECDHE) - unconditionally disable null and export-grade ciphers by always prepending "!aNULL:!eNULL:!EXP:" to any cipher suite string - do not configure per-connection SSL_tmp_*_callbacks, as it is sufficient to set them for the SSL_CTX - set default curve for ECDHE at startup, obviating the need for a per-handshake callback, for the time being (and also configure SSL_OP_SINGLE_ECDH_USE, previously left out) For additional background, see https://mail-archives.apache.org/mod_mbox/httpd-dev/201309.mbox/%3C52358ED1.2070704@velox.ch%3E git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1526168 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -521,15 +521,6 @@ int ssl_init_ssl_connection(conn_rec *c, request_rec *r)
|
||||
|
||||
sslconn->ssl = ssl;
|
||||
|
||||
/*
|
||||
* Configure callbacks for SSL connection
|
||||
*/
|
||||
SSL_set_tmp_rsa_callback(ssl, ssl_callback_TmpRSA);
|
||||
SSL_set_tmp_dh_callback(ssl, ssl_callback_TmpDH);
|
||||
#ifndef OPENSSL_NO_EC
|
||||
SSL_set_tmp_ecdh_callback(ssl, ssl_callback_TmpECDH);
|
||||
#endif
|
||||
|
||||
SSL_set_verify_result(ssl, X509_V_OK);
|
||||
|
||||
ssl_io_filter_init(c, r, ssl);
|
||||
|
Reference in New Issue
Block a user