diff options
| author |   jsing <jsing@openbsd.org> | 2015-09-12 13:35:34 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2015-09-12 13:35:34 +0000 |
| commit | c895b843af23b13bc31ff0d1db8faca30b566dec (patch) | |
| tree | 6c88ef4cc244759c1ddd4730a70b03c1f06b3608 /lib/libssl/src/ssl/d1_srvr.c | |
| parent | Wrap <dirent.h> so that internal calls go direct and they're all weak symbols (diff) | |
| download | wireguard-openbsd-c895b843af23b13bc31ff0d1db8faca30b566dec.tar.xz wireguard-openbsd-c895b843af23b13bc31ff0d1db8faca30b566dec.zip | |
Uncopy and unpaste dtls1_send_server_done().
Diffstat (limited to 'lib/libssl/src/ssl/d1_srvr.c')
| -rw-r--r-- | lib/libssl/src/ssl/d1_srvr.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/lib/libssl/src/ssl/d1_srvr.c b/lib/libssl/src/ssl/d1_srvr.c index 5c77a62e1d9..6e1c6d2ef93 100644 --- a/lib/libssl/src/ssl/d1_srvr.c +++ b/lib/libssl/src/ssl/d1_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_srvr.c,v 1.60 2015/09/12 13:25:26 jsing Exp $ */ +/* $OpenBSD: d1_srvr.c,v 1.61 2015/09/12 13:35:34 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -440,7 +440,7 @@ dtls1_accept(SSL *s) case SSL3_ST_SW_SRVR_DONE_A: case SSL3_ST_SW_SRVR_DONE_B: dtls1_start_timer(s); - ret = dtls1_send_server_done(s); + ret = ssl3_send_server_done(s); if (ret <= 0) goto end; s->s3->tmp.next_state = SSL3_ST_SR_CERT_A; @@ -700,20 +700,6 @@ dtls1_send_hello_verify_request(SSL *s) } int -dtls1_send_server_done(SSL *s) -{ - if (s->state == SSL3_ST_SW_SRVR_DONE_A) { - ssl3_handshake_msg_start(s, SSL3_MT_SERVER_DONE); - ssl3_handshake_msg_finish(s, 0); - - s->state = SSL3_ST_SW_SRVR_DONE_B; - } - - /* SSL3_ST_SW_SRVR_DONE_B */ - return (ssl3_handshake_write(s)); -} - -int dtls1_send_server_key_exchange(SSL *s) { unsigned char *q; |