Now that ssl3_send_{client,server}_certificate() are using the common

handshake functions, we can remove more copied code from DTLS.

1 files changed, 2 insertions, 29 deletions

diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index 8027e44123..472d0de9dd 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.68 2016/11/04 18:30:21 guenther Exp $ */
+/* $OpenBSD: d1_srvr.c,v 1.69 2016/12/06 13:38:11 jsing Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -368,7 +368,7 @@ dtls1_accept(SSL *s)
                         if (!(s->s3->tmp.new_cipher->algorithm_auth &
                             SSL_aNULL)) {
                                 dtls1_start_timer(s);
-                                ret = dtls1_send_server_certificate(s);
+                                ret = ssl3_send_server_certificate(s);
                                 if (ret <= 0)
                                         goto end;
                                 if (s->tlsext_status_expected)
@@ -722,30 +722,3 @@ dtls1_send_hello_verify_request(SSL *s)
         /* s->state = DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B */
         return (ssl3_handshake_write(s));
 }
-
-int
-dtls1_send_server_certificate(SSL *s)
-{
-        unsigned long l;
-        X509 *x;
-
-        if (s->state == SSL3_ST_SW_CERT_A) {
-                x = ssl_get_server_send_cert(s);
-                if (x == NULL) {
-                        SSLerr(SSL_F_DTLS1_SEND_SERVER_CERTIFICATE,
-                            ERR_R_INTERNAL_ERROR);
-                        return (0);
-                }
-
-                l = dtls1_output_cert_chain(s, x);
-                s->state = SSL3_ST_SW_CERT_B;
-                s->init_num = (int)l;
-                s->init_off = 0;
-
-                /* buffer the message to handle re-xmits */
-                dtls1_buffer_message(s, 0);
-        }
-
-        /* SSL3_ST_SW_CERT_B */
-        return (dtls1_do_write(s, SSL3_RT_HANDSHAKE));
-}