Nuke ssl_bad_method().

ok "flensing knife"

4 files changed, 4 insertions, 22 deletions

diff --git a/src/lib/libssl/src/ssl/ssl_lib.c b/src/lib/libssl/src/ssl/ssl_lib.c
index 4eb1d78f17..fe73046366 100644
--- a/src/lib/libssl/src/ssl/ssl_lib.c
+++ b/src/lib/libssl/src/ssl/ssl_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_lib.c,v 1.109 2015/09/11 17:29:36 jsing Exp $ */
+/* $OpenBSD: ssl_lib.c,v 1.110 2015/09/11 17:35:36 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -2533,14 +2533,6 @@ ssl_undefined_const_function(const SSL *s)
         return (0);
 }
 
-SSL_METHOD *
-ssl_bad_method(int ver)
-{
-        SSLerr(SSL_F_SSL_BAD_METHOD,
-            ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-        return (NULL);
-}
-
 const char *
 ssl_version_string(int ver)
 {
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h
index 897673c8d3..7249cabea5 100644
--- a/src/lib/libssl/src/ssl/ssl_locl.h
+++ b/src/lib/libssl/src/ssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.116 2015/09/11 17:32:23 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.117 2015/09/11 17:35:36 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -543,7 +543,6 @@ struct ssl_aead_ctx_st {
 extern SSL3_ENC_METHOD ssl3_undef_enc_method;
 extern SSL_CIPHER ssl3_ciphers[];
 
-SSL_METHOD *ssl_bad_method(int ver);
 const char *ssl_version_string(int ver);
 uint16_t ssl_max_server_version(SSL *s);
 
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 4eb1d78f17..fe73046366 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_lib.c,v 1.109 2015/09/11 17:29:36 jsing Exp $ */
+/* $OpenBSD: ssl_lib.c,v 1.110 2015/09/11 17:35:36 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -2533,14 +2533,6 @@ ssl_undefined_const_function(const SSL *s)
         return (0);
 }
 
-SSL_METHOD *
-ssl_bad_method(int ver)
-{
-        SSLerr(SSL_F_SSL_BAD_METHOD,
-            ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-        return (NULL);
-}
-
 const char *
 ssl_version_string(int ver)
 {
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 897673c8d3..7249cabea5 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.116 2015/09/11 17:32:23 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.117 2015/09/11 17:35:36 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -543,7 +543,6 @@ struct ssl_aead_ctx_st {
 extern SSL3_ENC_METHOD ssl3_undef_enc_method;
 extern SSL_CIPHER ssl3_ciphers[];
 
-SSL_METHOD *ssl_bad_method(int ver);
 const char *ssl_version_string(int ver);
 uint16_t ssl_max_server_version(SSL *s);