Merge d1_{clnt,srvr}.c into ssl_{clnt,srvr}.c

The d1_{clnt,srvr}.c contain a single function each - merge these into the
ssl_{clnt,srvr}.c, renaming them with an ssl3_ prefix for consistency.

ok beck@ tb@

1 files changed, 41 insertions, 2 deletions

diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c
index 0f448a2d38..1e92640835 100644
--- a/src/lib/libssl/ssl_srvr.c
+++ b/src/lib/libssl/ssl_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_srvr.c,v 1.85 2020/09/24 18:12:00 jsing Exp $ */
+/* $OpenBSD: ssl_srvr.c,v 1.86 2020/10/03 18:01:55 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -361,7 +361,7 @@ ssl3_accept(SSL *s)
 
                 case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A:
                 case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B:
-                        ret = dtls1_send_hello_verify_request(s);
+                        ret = ssl3_send_dtls_hello_verify_request(s);
                         if (ret <= 0)
                                 goto end;
                         S3I(s)->hs.state = SSL3_ST_SW_FLUSH;
@@ -1165,6 +1165,45 @@ err:
 }
 
 int
+ssl3_send_dtls_hello_verify_request(SSL *s)
+{
+        CBB cbb, verify, cookie;
+
+        memset(&cbb, 0, sizeof(cbb));
+
+        if (S3I(s)->hs.state == DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A) {
+                if (s->ctx->internal->app_gen_cookie_cb == NULL ||
+                    s->ctx->internal->app_gen_cookie_cb(s, D1I(s)->cookie,
+                        &(D1I(s)->cookie_len)) == 0) {
+                        SSLerror(s, ERR_R_INTERNAL_ERROR);
+                        return 0;
+                }
+
+                if (!ssl3_handshake_msg_start(s, &cbb, &verify,
+                    DTLS1_MT_HELLO_VERIFY_REQUEST))
+                        goto err;
+                if (!CBB_add_u16(&verify, s->version))
+                        goto err;
+                if (!CBB_add_u8_length_prefixed(&verify, &cookie))
+                        goto err;
+                if (!CBB_add_bytes(&cookie, D1I(s)->cookie, D1I(s)->cookie_len))
+                        goto err;
+                if (!ssl3_handshake_msg_finish(s, &cbb))
+                        goto err;
+
+                S3I(s)->hs.state = DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B;
+        }
+
+        /* S3I(s)->hs.state = DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B */
+        return (ssl3_handshake_write(s));
+
+ err:
+        CBB_cleanup(&cbb);
+
+        return (-1);
+}
+
+int
 ssl3_send_server_hello(SSL *s)
 {
         CBB cbb, server_hello, session_id;