Use TLSv1_1_enc_data instead of DTLSv1_enc_data.

DTLSv1 is TLSv1.1 over datagrams - there is no need for a separate
SSL3_ENC_METHOD struct, just use TLSv1_1_enc_data and remove
DTLSv1_enc_data entirely.

ok tb@

3 files changed, 6 insertions, 11 deletions

diff --git a/src/lib/libssl/d1_lib.c b/src/lib/libssl/d1_lib.c
index b7d23ef4ca..b4ce2c0722 100644
--- a/src/lib/libssl/d1_lib.c
+++ b/src/lib/libssl/d1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_lib.c,v 1.50 2020/09/26 14:43:17 jsing Exp $ */
+/* $OpenBSD: d1_lib.c,v 1.51 2020/10/03 17:54:27 jsing Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -74,10 +74,6 @@ void dtls1_hm_fragment_free(hm_fragment *frag);
 
 static int dtls1_listen(SSL *s, struct sockaddr *client);
 
-SSL3_ENC_METHOD DTLSv1_enc_data = {
-        .enc_flags = SSL_ENC_FLAG_EXPLICIT_IV,
-};
-
 int
 dtls1_new(SSL *s)
 {
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 0dda3ecd01..22f9760225 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.296 2020/10/03 17:35:16 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.297 2020/10/03 17:54:27 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1140,7 +1140,6 @@ const SSL_METHOD *tls_legacy_server_method(void);
 const SSL_METHOD *ssl_get_client_method(uint16_t version);
 const SSL_METHOD *ssl_get_server_method(uint16_t version);
 
-extern SSL3_ENC_METHOD DTLSv1_enc_data;
 extern SSL3_ENC_METHOD TLSv1_enc_data;
 extern SSL3_ENC_METHOD TLSv1_1_enc_data;
 extern SSL3_ENC_METHOD TLSv1_2_enc_data;
diff --git a/src/lib/libssl/ssl_methods.c b/src/lib/libssl/ssl_methods.c
index ff8d17af06..ddfb8dfdba 100644
--- a/src/lib/libssl/ssl_methods.c
+++ b/src/lib/libssl/ssl_methods.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_methods.c,v 1.16 2020/09/17 15:23:29 jsing Exp $ */
+/* $OpenBSD: ssl_methods.c,v 1.17 2020/10/03 17:54:27 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -74,7 +74,7 @@ static const SSL_METHOD_INTERNAL DTLSv1_client_method_internal_data = {
         .ssl_pending = ssl3_pending,
         .ssl_read_bytes = dtls1_read_bytes,
         .ssl_write_bytes = dtls1_write_app_data_bytes,
-        .ssl3_enc = &DTLSv1_enc_data,
+        .ssl3_enc = &TLSv1_1_enc_data,
 };
 
 static const SSL_METHOD DTLSv1_client_method_data = {
@@ -113,7 +113,7 @@ static const SSL_METHOD_INTERNAL DTLSv1_method_internal_data = {
         .ssl_pending = ssl3_pending,
         .ssl_read_bytes = dtls1_read_bytes,
         .ssl_write_bytes = dtls1_write_app_data_bytes,
-        .ssl3_enc = &DTLSv1_enc_data,
+        .ssl3_enc = &TLSv1_1_enc_data,
 };
 
 static const SSL_METHOD DTLSv1_method_data = {
@@ -152,7 +152,7 @@ static const SSL_METHOD_INTERNAL DTLSv1_server_method_internal_data = {
         .ssl_pending = ssl3_pending,
         .ssl_read_bytes = dtls1_read_bytes,
         .ssl_write_bytes = dtls1_write_app_data_bytes,
-        .ssl3_enc = &DTLSv1_enc_data,
+        .ssl3_enc = &TLSv1_1_enc_data,
 };
 
 static const SSL_METHOD DTLSv1_server_method_data = {