diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2015-09-12 13:09:08 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2015-09-12 13:09:08 +0000 |
| commit | c5dc3797683a187794ef5c62f56982fe48c06445 (patch) | |
| tree | e0a9fc70fea4ddee6172de017eec9b158ac2c669 /lib | |
| parent | 40d72e7679116b59ac2ad199fe6f8914f8a2749f (diff) | |
Uncopy and unpaste dtls1_send_hello_request().
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/d1_srvr.c | 18 | ||||
| -rw-r--r-- | lib/libssl/ssl_locl.h | 3 |
2 files changed, 3 insertions, 18 deletions
diff --git a/lib/libssl/d1_srvr.c b/lib/libssl/d1_srvr.c index c0489adfa48..ab5c3fcb2cf 100644 --- a/lib/libssl/d1_srvr.c +++ b/lib/libssl/d1_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_srvr.c,v 1.58 2015/09/11 18:08:21 jsing Exp $ */ +/* $OpenBSD: d1_srvr.c,v 1.59 2015/09/12 13:09:07 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -271,7 +271,7 @@ dtls1_accept(SSL *s) s->shutdown = 0; dtls1_clear_record_buffer(s); dtls1_start_timer(s); - ret = dtls1_send_hello_request(s); + ret = ssl3_send_hello_request(s); if (ret <= 0) goto end; s->s3->tmp.next_state = SSL3_ST_SR_CLNT_HELLO_A; @@ -667,20 +667,6 @@ end: } int -dtls1_send_hello_request(SSL *s) -{ - if (s->state == SSL3_ST_SW_HELLO_REQ_A) { - ssl3_handshake_msg_start(s, SSL3_MT_HELLO_REQUEST); - ssl3_handshake_msg_finish(s, 0); - - s->state = SSL3_ST_SW_HELLO_REQ_B; - } - - /* SSL3_ST_SW_HELLO_REQ_B */ - return (ssl3_handshake_write(s)); -} - -int dtls1_send_hello_verify_request(SSL *s) { unsigned char *d, *p; diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h index 48ac8c8b2de..e817620d8bf 100644 --- a/lib/libssl/ssl_locl.h +++ b/lib/libssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.121 2015/09/12 12:58:15 jsing Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.122 2015/09/12 13:09:07 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -724,7 +724,6 @@ int ssl3_get_client_key_exchange(SSL *s); int ssl3_get_cert_verify(SSL *s); int ssl3_get_next_proto(SSL *s); -int dtls1_send_hello_request(SSL *s); int dtls1_send_server_hello(SSL *s); int dtls1_send_server_certificate(SSL *s); int dtls1_send_server_key_exchange(SSL *s); |