summaryrefslogtreecommitdiffstats
path: root/ssl/ssl.h
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-10-29 12:51:31 +0000
committerDr. Stephen Henson <steve@openssl.org>2014-11-19 22:54:30 +0000
commit017a15cbd290a6fd008f19d1873071f36a624b1b (patch)
tree3f788ea0d890eb3a13b9c973064cf544cc50d7ad /ssl/ssl.h
parent786370b1b09b919d9306f27336e13783e4fe3fd0 (diff)
New option no-ssl3-method which removes SSLv3_*method
When no-ssl3 is set only make SSLv3 disabled by default. Retain -ssl3 options for s_client/s_server/ssltest. When no-ssl3-method is set SSLv3_*method() is removed and all -ssl3 options. We should document this somewhere, e.g. wiki, FAQ or manual page. Reviewed-by: Emilia Käsper <emilia@openssl.org> (cherry picked from commit 3881d8106df732fc433d30446625dfa2396da42d)
Diffstat (limited to 'ssl/ssl.h')
-rw-r--r--ssl/ssl.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 82e5894a3a..e51202996c 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -2222,9 +2222,11 @@ const SSL_METHOD *SSLv2_server_method(void); /* SSLv2 */
const SSL_METHOD *SSLv2_client_method(void); /* SSLv2 */
#endif
+#ifndef OPENSSL_NO_SSL3_METHOD
const SSL_METHOD *SSLv3_method(void); /* SSLv3 */
const SSL_METHOD *SSLv3_server_method(void); /* SSLv3 */
const SSL_METHOD *SSLv3_client_method(void); /* SSLv3 */
+#endif
const SSL_METHOD *SSLv23_method(void); /* SSLv3 but can rollback to v2 */
const SSL_METHOD *SSLv23_server_method(void); /* SSLv3 but can rollback to v2 */