Remove SSLv3 method data structs and unlink s3_meth.c from the build.

ok jsing@

5 files changed, 6 insertions, 164 deletions

diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index 30f679eac3..5503f89ab6 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_clnt.c,v 1.122 2015/08/27 06:21:15 doug Exp $ */
+/* $OpenBSD: s3_clnt.c,v 1.123 2015/08/29 16:51:17 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -170,47 +170,8 @@
 
 #include "bytestring.h"
 
-static const SSL_METHOD *ssl3_get_client_method(int ver);
 static int ca_dn_cmp(const X509_NAME * const *a, const X509_NAME * const *b);
 
-const SSL_METHOD SSLv3_client_method_data = {
-        .version = SSL3_VERSION,
-        .ssl_new = ssl3_new,
-        .ssl_clear = ssl3_clear,
-        .ssl_free = ssl3_free,
-        .ssl_accept = ssl_undefined_function,
-        .ssl_connect = ssl3_connect,
-        .ssl_read = ssl3_read,
-        .ssl_peek = ssl3_peek,
-        .ssl_write = ssl3_write,
-        .ssl_shutdown = ssl3_shutdown,
-        .ssl_renegotiate = ssl3_renegotiate,
-        .ssl_renegotiate_check = ssl3_renegotiate_check,
-        .ssl_get_message = ssl3_get_message,
-        .ssl_read_bytes = ssl3_read_bytes,
-        .ssl_write_bytes = ssl3_write_bytes,
-        .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .ssl_ctrl = ssl3_ctrl,
-        .ssl_ctx_ctrl = ssl3_ctx_ctrl,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
-        .ssl_pending = ssl3_pending,
-        .num_ciphers = ssl3_num_ciphers,
-        .get_cipher = ssl3_get_cipher,
-        .get_ssl_method = ssl3_get_client_method,
-        .get_timeout = ssl3_default_timeout,
-        .ssl3_enc = &SSLv3_enc_data,
-        .ssl_version = ssl_undefined_void_function,
-        .ssl_callback_ctrl = ssl3_callback_ctrl,
-        .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
-};
-
-static const SSL_METHOD *
-ssl3_get_client_method(int ver)
-{
-        return (NULL);
-}
-
 int
 ssl3_connect(SSL *s)
 {
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index 5574884b89..9962cabd73 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_srvr.c,v 1.113 2015/08/27 06:21:15 doug Exp $ */
+/* $OpenBSD: s3_srvr.c,v 1.114 2015/08/29 16:51:17 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -166,46 +166,6 @@
 
 #include "bytestring.h"
 
-static const SSL_METHOD *ssl3_get_server_method(int ver);
-
-const SSL_METHOD SSLv3_server_method_data = {
-        .version = SSL3_VERSION,
-        .ssl_new = ssl3_new,
-        .ssl_clear = ssl3_clear,
-        .ssl_free = ssl3_free,
-        .ssl_accept = ssl3_accept,
-        .ssl_connect = ssl_undefined_function,
-        .ssl_read = ssl3_read,
-        .ssl_peek = ssl3_peek,
-        .ssl_write = ssl3_write,
-        .ssl_shutdown = ssl3_shutdown,
-        .ssl_renegotiate = ssl3_renegotiate,
-        .ssl_renegotiate_check = ssl3_renegotiate_check,
-        .ssl_get_message = ssl3_get_message,
-        .ssl_read_bytes = ssl3_read_bytes,
-        .ssl_write_bytes = ssl3_write_bytes,
-        .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .ssl_ctrl = ssl3_ctrl,
-        .ssl_ctx_ctrl = ssl3_ctx_ctrl,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
-        .ssl_pending = ssl3_pending,
-        .num_ciphers = ssl3_num_ciphers,
-        .get_cipher = ssl3_get_cipher,
-        .get_ssl_method = ssl3_get_server_method,
-        .get_timeout = ssl3_default_timeout,
-        .ssl3_enc = &SSLv3_enc_data,
-        .ssl_version = ssl_undefined_void_function,
-        .ssl_callback_ctrl = ssl3_callback_ctrl,
-        .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
-};
-
-static const SSL_METHOD *
-ssl3_get_server_method(int ver)
-{
-        return (NULL);
-}
-
 int
 ssl3_accept(SSL *s)
 {
diff --git a/src/lib/libssl/src/ssl/s3_clnt.c b/src/lib/libssl/src/ssl/s3_clnt.c
index 30f679eac3..5503f89ab6 100644
--- a/src/lib/libssl/src/ssl/s3_clnt.c
+++ b/src/lib/libssl/src/ssl/s3_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_clnt.c,v 1.122 2015/08/27 06:21:15 doug Exp $ */
+/* $OpenBSD: s3_clnt.c,v 1.123 2015/08/29 16:51:17 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -170,47 +170,8 @@
 
 #include "bytestring.h"
 
-static const SSL_METHOD *ssl3_get_client_method(int ver);
 static int ca_dn_cmp(const X509_NAME * const *a, const X509_NAME * const *b);
 
-const SSL_METHOD SSLv3_client_method_data = {
-        .version = SSL3_VERSION,
-        .ssl_new = ssl3_new,
-        .ssl_clear = ssl3_clear,
-        .ssl_free = ssl3_free,
-        .ssl_accept = ssl_undefined_function,
-        .ssl_connect = ssl3_connect,
-        .ssl_read = ssl3_read,
-        .ssl_peek = ssl3_peek,
-        .ssl_write = ssl3_write,
-        .ssl_shutdown = ssl3_shutdown,
-        .ssl_renegotiate = ssl3_renegotiate,
-        .ssl_renegotiate_check = ssl3_renegotiate_check,
-        .ssl_get_message = ssl3_get_message,
-        .ssl_read_bytes = ssl3_read_bytes,
-        .ssl_write_bytes = ssl3_write_bytes,
-        .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .ssl_ctrl = ssl3_ctrl,
-        .ssl_ctx_ctrl = ssl3_ctx_ctrl,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
-        .ssl_pending = ssl3_pending,
-        .num_ciphers = ssl3_num_ciphers,
-        .get_cipher = ssl3_get_cipher,
-        .get_ssl_method = ssl3_get_client_method,
-        .get_timeout = ssl3_default_timeout,
-        .ssl3_enc = &SSLv3_enc_data,
-        .ssl_version = ssl_undefined_void_function,
-        .ssl_callback_ctrl = ssl3_callback_ctrl,
-        .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
-};
-
-static const SSL_METHOD *
-ssl3_get_client_method(int ver)
-{
-        return (NULL);
-}
-
 int
 ssl3_connect(SSL *s)
 {
diff --git a/src/lib/libssl/src/ssl/s3_srvr.c b/src/lib/libssl/src/ssl/s3_srvr.c
index 5574884b89..9962cabd73 100644
--- a/src/lib/libssl/src/ssl/s3_srvr.c
+++ b/src/lib/libssl/src/ssl/s3_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_srvr.c,v 1.113 2015/08/27 06:21:15 doug Exp $ */
+/* $OpenBSD: s3_srvr.c,v 1.114 2015/08/29 16:51:17 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -166,46 +166,6 @@
 
 #include "bytestring.h"
 
-static const SSL_METHOD *ssl3_get_server_method(int ver);
-
-const SSL_METHOD SSLv3_server_method_data = {
-        .version = SSL3_VERSION,
-        .ssl_new = ssl3_new,
-        .ssl_clear = ssl3_clear,
-        .ssl_free = ssl3_free,
-        .ssl_accept = ssl3_accept,
-        .ssl_connect = ssl_undefined_function,
-        .ssl_read = ssl3_read,
-        .ssl_peek = ssl3_peek,
-        .ssl_write = ssl3_write,
-        .ssl_shutdown = ssl3_shutdown,
-        .ssl_renegotiate = ssl3_renegotiate,
-        .ssl_renegotiate_check = ssl3_renegotiate_check,
-        .ssl_get_message = ssl3_get_message,
-        .ssl_read_bytes = ssl3_read_bytes,
-        .ssl_write_bytes = ssl3_write_bytes,
-        .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .ssl_ctrl = ssl3_ctrl,
-        .ssl_ctx_ctrl = ssl3_ctx_ctrl,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
-        .ssl_pending = ssl3_pending,
-        .num_ciphers = ssl3_num_ciphers,
-        .get_cipher = ssl3_get_cipher,
-        .get_ssl_method = ssl3_get_server_method,
-        .get_timeout = ssl3_default_timeout,
-        .ssl3_enc = &SSLv3_enc_data,
-        .ssl_version = ssl_undefined_void_function,
-        .ssl_callback_ctrl = ssl3_callback_ctrl,
-        .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
-};
-
-static const SSL_METHOD *
-ssl3_get_server_method(int ver)
-{
-        return (NULL);
-}
-
 int
 ssl3_accept(SSL *s)
 {
diff --git a/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile
index 0ff974e4de..5214debc1b 100644
--- a/src/lib/libssl/ssl/Makefile
+++ b/src/lib/libssl/ssl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.53 2015/06/27 22:42:02 doug Exp $
+# $OpenBSD: Makefile,v 1.54 2015/08/29 16:51:17 doug Exp $
 
 LIB=    ssl
 
@@ -16,7 +16,7 @@ CFLAGS+= -I${SSL_SRC}
 LDADD+= -L${BSDOBJDIR}/lib/libcrypto/crypto -lcrypto
 
 SRCS=\
-        s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c \
+        s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c \
         s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c \
         t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c \
         d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c \