New option no-ssl3-method which removes SSLv3_*method

[openssl.git] / ssl / ssl.h

diff --git a/ssl/ssl.h b/ssl/ssl.h
index f45264ce59aa7e6b157c652a89f7948d84c24595..beb00a042a5d01453c50d8163536ba24b492caf9 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -2235,9 +2235,11 @@ const SSL_METHOD *SSLv2_server_method(void);     /* SSLv2 */
 const SSL_METHOD *SSLv2_client_method(void);   /* SSLv2 */
 #endif
 
 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 */
 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 */
 
 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 */


@@ -2781,6 +2783,7 @@ void ERR_load_SSL_strings(void);
 #define SSL_F_TLS1_PREPARE_SERVERHELLO_TLSEXT           276
 #define SSL_F_TLS1_PRF                                  284
 #define SSL_F_TLS1_SETUP_KEY_BLOCK                      211
 #define SSL_F_TLS1_PREPARE_SERVERHELLO_TLSEXT           276
 #define SSL_F_TLS1_PRF                                  284
 #define SSL_F_TLS1_SETUP_KEY_BLOCK                      211

+#define SSL_F_TLS1_SET_SERVER_SIGALGS                   335

 #define SSL_F_WRITE_PENDING                             212
 
 /* Reason codes. */
 #define SSL_F_WRITE_PENDING                             212
 
 /* Reason codes. */