summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViktor Dukhovni <openssl-users@dukhovni.org>2016-03-08 15:33:02 -0500
committerViktor Dukhovni <openssl-users@dukhovni.org>2016-03-09 03:14:24 -0500
commitfcedd2d69d950af8fcde05206ee35e8a2b1cfb0b (patch)
tree374cb7285b65b20790c054110c67f79150ce3f5d
parent133138569f37d149ed1d7641fe8c75a93fded445 (diff)
downloadopenssl-new-fcedd2d69d950af8fcde05206ee35e8a2b1cfb0b.tar.gz
expose SSLv2 method prototypes
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
-rw-r--r--ssl/s2_meth.c6
-rw-r--r--ssl/ssl.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/ssl/s2_meth.c b/ssl/s2_meth.c
index d46e2f5af8..019d9dcf6c 100644
--- a/ssl/s2_meth.c
+++ b/ssl/s2_meth.c
@@ -74,8 +74,8 @@ IMPLEMENT_ssl2_meth_func(SSLv2_method,
ssl2_accept, ssl2_connect, ssl2_get_method)
#else /* !OPENSSL_NO_SSL2 */
-SSL_METHOD *SSLv2_method(void) { return NULL; }
-SSL_METHOD *SSLv2_client_method(void) { return NULL; }
-SSL_METHOD *SSLv2_server_method(void) { return NULL; }
+const SSL_METHOD *SSLv2_method(void) { return NULL; }
+const SSL_METHOD *SSLv2_client_method(void) { return NULL; }
+const SSL_METHOD *SSLv2_server_method(void) { return NULL; }
#endif
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 5752f6b09d..2e84b95611 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -2345,11 +2345,9 @@ const char *SSL_get_version(const SSL *s);
/* This sets the 'default' SSL version that SSL_new() will create */
int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth);
-# ifndef OPENSSL_NO_SSL2
const SSL_METHOD *SSLv2_method(void); /* SSLv2 */
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 */