summaryrefslogtreecommitdiffstats
path: root/ssl/s2_meth.c
diff options
context:
space:
mode:
authorKurt Roeckx <kurt@roeckx.be>2016-03-09 18:10:52 +0100
committerKurt Roeckx <kurt@roeckx.be>2016-03-14 21:13:59 +0100
commit4256957570a233ed4e9840353e95e623dfd62086 (patch)
tree6fd41f98f2b3392be2b660abb56d748168c7983a /ssl/s2_meth.c
parente76f48539109829819aabc03953cf2cfd4612961 (diff)
Add no-ssl2-method
Reviewed-by: Viktor Dukhovni <viktor@openssl.org> MR: #2341
Diffstat (limited to 'ssl/s2_meth.c')
-rw-r--r--ssl/s2_meth.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/ssl/s2_meth.c b/ssl/s2_meth.c
index 019d9dcf6c..73885b7ecf 100644
--- a/ssl/s2_meth.c
+++ b/ssl/s2_meth.c
@@ -57,7 +57,8 @@
*/
#include "ssl_locl.h"
-#ifndef OPENSSL_NO_SSL2
+#ifndef OPENSSL_NO_SSL2_METHOD
+# ifndef OPENSSL_NO_SSL2
# include <stdio.h>
# include <openssl/objects.h>
@@ -72,10 +73,19 @@ static const SSL_METHOD *ssl2_get_method(int ver)
IMPLEMENT_ssl2_meth_func(SSLv2_method,
ssl2_accept, ssl2_connect, ssl2_get_method)
-#else /* !OPENSSL_NO_SSL2 */
+
+# else /* !OPENSSL_NO_SSL2 */
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
+
+#else /* !OPENSSL_NO_SSL2_METHOD */
+
+# if PEDANTIC
+static void *dummy = &dummy;
+# endif
+
#endif