diff options
| author | jsing <> | 2015-09-12 13:35:34 +0000 | 
|---|---|---|
| committer | jsing <> | 2015-09-12 13:35:34 +0000 | 
| commit | f464ada48500955950efc7e498c4cbecdda1ea79 (patch) | |
| tree | 9f5d8950bc4b32f16619f20ee6e1ed626c696d2b /src/lib/libssl/d1_srvr.c | |
| parent | 0174f2843e80723463666078857f50ee41852d31 (diff) | |
| download | openbsd-f464ada48500955950efc7e498c4cbecdda1ea79.tar.gz openbsd-f464ada48500955950efc7e498c4cbecdda1ea79.tar.bz2 openbsd-f464ada48500955950efc7e498c4cbecdda1ea79.zip | |
Uncopy and unpaste dtls1_send_server_done().
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/d1_srvr.c | 18 | 
1 files changed, 2 insertions, 16 deletions
| diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c index 5c77a62e1d..6e1c6d2ef9 100644 --- a/src/lib/libssl/d1_srvr.c +++ b/src/lib/libssl/d1_srvr.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: d1_srvr.c,v 1.60 2015/09/12 13:25:26 jsing Exp $ */ | 1 | /* $OpenBSD: d1_srvr.c,v 1.61 2015/09/12 13:35:34 jsing Exp $ */ | 
| 2 | /* | 2 | /* | 
| 3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu | 
| 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 
| @@ -440,7 +440,7 @@ dtls1_accept(SSL *s) | |||
| 440 | case SSL3_ST_SW_SRVR_DONE_A: | 440 | case SSL3_ST_SW_SRVR_DONE_A: | 
| 441 | case SSL3_ST_SW_SRVR_DONE_B: | 441 | case SSL3_ST_SW_SRVR_DONE_B: | 
| 442 | dtls1_start_timer(s); | 442 | dtls1_start_timer(s); | 
| 443 | ret = dtls1_send_server_done(s); | 443 | ret = ssl3_send_server_done(s); | 
| 444 | if (ret <= 0) | 444 | if (ret <= 0) | 
| 445 | goto end; | 445 | goto end; | 
| 446 | s->s3->tmp.next_state = SSL3_ST_SR_CERT_A; | 446 | s->s3->tmp.next_state = SSL3_ST_SR_CERT_A; | 
| @@ -700,20 +700,6 @@ dtls1_send_hello_verify_request(SSL *s) | |||
| 700 | } | 700 | } | 
| 701 | 701 | ||
| 702 | int | 702 | int | 
| 703 | dtls1_send_server_done(SSL *s) | ||
| 704 | { | ||
| 705 | if (s->state == SSL3_ST_SW_SRVR_DONE_A) { | ||
| 706 | ssl3_handshake_msg_start(s, SSL3_MT_SERVER_DONE); | ||
| 707 | ssl3_handshake_msg_finish(s, 0); | ||
| 708 | |||
| 709 | s->state = SSL3_ST_SW_SRVR_DONE_B; | ||
| 710 | } | ||
| 711 | |||
| 712 | /* SSL3_ST_SW_SRVR_DONE_B */ | ||
| 713 | return (ssl3_handshake_write(s)); | ||
| 714 | } | ||
| 715 | |||
| 716 | int | ||
| 717 | dtls1_send_server_key_exchange(SSL *s) | 703 | dtls1_send_server_key_exchange(SSL *s) | 
| 718 | { | 704 | { | 
| 719 | unsigned char *q; | 705 | unsigned char *q; | 
