diff options
| author | jsing <> | 2015-09-12 13:09:07 +0000 |
|---|---|---|
| committer | jsing <> | 2015-09-12 13:09:07 +0000 |
| commit | 229d27cfe422c13c6db0cfc2ae6dab7b097c10fb (patch) | |
| tree | 71d4bc34266b8c5229e8e0da665410237ba73e47 /src/lib/libssl/d1_srvr.c | |
| parent | 861ea05a645016d04dc582348d75897caef406b4 (diff) | |
| download | openbsd-229d27cfe422c13c6db0cfc2ae6dab7b097c10fb.tar.gz openbsd-229d27cfe422c13c6db0cfc2ae6dab7b097c10fb.tar.bz2 openbsd-229d27cfe422c13c6db0cfc2ae6dab7b097c10fb.zip | |
Uncopy and unpaste dtls1_send_hello_request().
Diffstat (limited to 'src/lib/libssl/d1_srvr.c')
| -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 c0489adfa4..ab5c3fcb2c 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.58 2015/09/11 18:08:21 jsing Exp $ */ | 1 | /* $OpenBSD: d1_srvr.c,v 1.59 2015/09/12 13:09:07 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. |
| @@ -271,7 +271,7 @@ dtls1_accept(SSL *s) | |||
| 271 | s->shutdown = 0; | 271 | s->shutdown = 0; |
| 272 | dtls1_clear_record_buffer(s); | 272 | dtls1_clear_record_buffer(s); |
| 273 | dtls1_start_timer(s); | 273 | dtls1_start_timer(s); |
| 274 | ret = dtls1_send_hello_request(s); | 274 | ret = ssl3_send_hello_request(s); |
| 275 | if (ret <= 0) | 275 | if (ret <= 0) |
| 276 | goto end; | 276 | goto end; |
| 277 | s->s3->tmp.next_state = SSL3_ST_SR_CLNT_HELLO_A; | 277 | s->s3->tmp.next_state = SSL3_ST_SR_CLNT_HELLO_A; |
| @@ -667,20 +667,6 @@ end: | |||
| 667 | } | 667 | } |
| 668 | 668 | ||
| 669 | int | 669 | int |
| 670 | dtls1_send_hello_request(SSL *s) | ||
| 671 | { | ||
| 672 | if (s->state == SSL3_ST_SW_HELLO_REQ_A) { | ||
| 673 | ssl3_handshake_msg_start(s, SSL3_MT_HELLO_REQUEST); | ||
| 674 | ssl3_handshake_msg_finish(s, 0); | ||
| 675 | |||
| 676 | s->state = SSL3_ST_SW_HELLO_REQ_B; | ||
| 677 | } | ||
| 678 | |||
| 679 | /* SSL3_ST_SW_HELLO_REQ_B */ | ||
| 680 | return (ssl3_handshake_write(s)); | ||
| 681 | } | ||
| 682 | |||
| 683 | int | ||
| 684 | dtls1_send_hello_verify_request(SSL *s) | 670 | dtls1_send_hello_verify_request(SSL *s) |
| 685 | { | 671 | { |
| 686 | unsigned char *d, *p; | 672 | unsigned char *d, *p; |
