Consolidate all of the SSL method structs/functions into a single file.

Discussed with tb@

1 files changed, 1 insertions, 44 deletions

diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index c0ee0d00aa..1a1ee5429e 100644
--- a/src/lib/libssl/d1_srvr.c
+++ b/src/lib/libssl/d1_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_srvr.c,v 1.94 2018/08/30 16:56:16 jsing Exp $ */
+/* $OpenBSD: d1_srvr.c,v 1.95 2018/11/05 05:45:15 jsing Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -125,49 +125,6 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 
-static const SSL_METHOD_INTERNAL DTLSv1_server_method_internal_data = {
-        .version = DTLS1_VERSION,
-        .min_version = DTLS1_VERSION,
-        .max_version = DTLS1_VERSION,
-        .ssl_new = dtls1_new,
-        .ssl_clear = dtls1_clear,
-        .ssl_free = dtls1_free,
-        .ssl_accept = ssl3_accept,
-        .ssl_connect = ssl_undefined_function,
-        .get_ssl_method = dtls1_get_server_method,
-        .get_timeout = dtls1_default_timeout,
-        .ssl_version = ssl_undefined_void_function,
-        .ssl_renegotiate = ssl3_renegotiate,
-        .ssl_renegotiate_check = ssl3_renegotiate_check,
-        .ssl_get_message = dtls1_get_message,
-        .ssl_read_bytes = dtls1_read_bytes,
-        .ssl_write_bytes = dtls1_write_app_data_bytes,
-        .ssl3_enc = &DTLSv1_enc_data,
-};
-
-static const SSL_METHOD DTLSv1_server_method_data = {
-        .ssl_dispatch_alert = dtls1_dispatch_alert,
-        .num_ciphers = ssl3_num_ciphers,
-        .get_cipher = dtls1_get_cipher,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
-        .internal = &DTLSv1_server_method_internal_data,
-};
-
-const SSL_METHOD *
-DTLSv1_server_method(void)
-{
-        return &DTLSv1_server_method_data;
-}
-
-const SSL_METHOD *
-dtls1_get_server_method(int ver)
-{
-        if (ver == DTLS1_VERSION)
-                return (DTLSv1_server_method());
-        return (NULL);
-}
-
 int
 dtls1_send_hello_verify_request(SSL *s)
 {