From b9add1b57a2fe8006e83c66e6f16f11da2031ba5 Mon Sep 17 00:00:00 2001
From: doug <>
Date: Sat, 29 Aug 2015 17:15:52 +0000
Subject: Now that SSLv3 is going away, TLS_* and SSLv23 are equivalent.

Remove the TLS method data and tls_any_* functions.  Point to SSLv23.

ok jsing@
---
 src/lib/libssl/s23_srvr.c | 61 ++---------------------------------------------
 1 file changed, 2 insertions(+), 59 deletions(-)

(limited to 'src/lib/libssl/s23_srvr.c')

diff --git a/src/lib/libssl/s23_srvr.c b/src/lib/libssl/s23_srvr.c
index 7b2107680e..d4ca586c2d 100644
--- a/src/lib/libssl/s23_srvr.c
+++ b/src/lib/libssl/s23_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s23_srvr.c,v 1.42 2015/08/27 06:21:15 doug Exp $ */
+/* $OpenBSD: s23_srvr.c,v 1.43 2015/08/29 17:15:52 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -119,7 +119,6 @@
 
 static const SSL_METHOD *ssl23_get_server_method(int ver);
 int ssl23_get_client_hello(SSL *s);
-static const SSL_METHOD *tls_any_get_server_method(int ver);
 
 const SSL_METHOD SSLv23_server_method_data = {
 	.version = TLS1_2_VERSION,
@@ -153,38 +152,6 @@ const SSL_METHOD SSLv23_server_method_data = {
 	.ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
 };
 
-const SSL_METHOD TLS_server_method_data = {
-	.version = TLS1_2_VERSION,
-	.ssl_new = tls1_new,
-	.ssl_clear = tls1_clear,
-	.ssl_free = tls1_free,
-	.ssl_accept = tls_any_accept,
-	.ssl_connect = ssl_undefined_function,
-	.ssl_read = ssl23_read,
-	.ssl_peek = ssl23_peek,
-	.ssl_write = ssl23_write,
-	.ssl_shutdown = ssl_undefined_function,
-	.ssl_renegotiate = ssl_undefined_function,
-	.ssl_renegotiate_check = ssl_ok,
-	.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 = ssl_undefined_const_function,
-	.num_ciphers = ssl3_num_ciphers,
-	.get_cipher = ssl3_get_cipher,
-	.get_ssl_method = tls_any_get_server_method,
-	.get_timeout = ssl23_default_timeout,
-	.ssl3_enc = &ssl3_undef_enc_method,
-	.ssl_version = ssl_undefined_void_function,
-	.ssl_callback_ctrl = ssl3_callback_ctrl,
-	.ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
-};
-
 const SSL_METHOD *
 SSLv23_server_method(void)
 {
@@ -592,29 +559,5 @@ ssl23_get_client_hello(SSL *s)
 const SSL_METHOD *
 TLS_server_method(void)
 {
-	return &TLS_server_method_data;
-}
-
-static const SSL_METHOD *
-tls_any_get_server_method(int ver)
-{
-	if (ver == SSL3_VERSION)
-		return (NULL);
-	else
-		return ssl23_get_server_method(ver);
-}
-
-int
-tls_any_accept(SSL *s)
-{
-	int ret;
-	unsigned long old_options;
-
-	old_options = s->options;
-
-	s->options |= SSL_OP_NO_SSLv3;
-	ret = ssl23_accept(s);
-	s->options = old_options;
-
-	return ret;
+	return &SSLv23_server_method_data;
 }
-- 
cgit v1.2.3-55-g6feb