diff options
| author |   jsing <jsing@openbsd.org> | 2017-01-26 06:32:58 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2017-01-26 06:32:58 +0000 |
| commit | 53f78dfd664e371a1c7d0aa18adf6139de8bb900 (patch) | |
| tree | 74c1665415e04cbdc3beb729468cb418c05eab80 /lib/libssl/d1_clnt.c | |
| parent | Move relatively new version range code from ssl_lib.c into a separate (diff) | |
| download | wireguard-openbsd-53f78dfd664e371a1c7d0aa18adf6139de8bb900.tar.xz wireguard-openbsd-53f78dfd664e371a1c7d0aa18adf6139de8bb900.zip | |
Remove most of SSL3_ENC_METHOD - we can just inline the function calls
and defines since they are the same everywhere.
ok beck@
Diffstat (limited to 'lib/libssl/d1_clnt.c')
| -rw-r--r-- | lib/libssl/d1_clnt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libssl/d1_clnt.c b/lib/libssl/d1_clnt.c index 5f8b56ebed7..c0f90dce6fa 100644 --- a/lib/libssl/d1_clnt.c +++ b/lib/libssl/d1_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_clnt.c,v 1.70 2017/01/26 05:31:25 jsing Exp $ */ +/* $OpenBSD: d1_clnt.c,v 1.71 2017/01/26 06:32:58 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -437,12 +437,12 @@ dtls1_connect(SSL *s) s->internal->init_num = 0; s->session->cipher = S3I(s)->tmp.new_cipher; - if (!s->method->internal->ssl3_enc->setup_key_block(s)) { + if (!tls1_setup_key_block(s)) { ret = -1; goto end; } - if (!s->method->internal->ssl3_enc->change_cipher_state(s, + if (!tls1_change_cipher_state(s, SSL3_CHANGE_CIPHER_CLIENT_WRITE)) { ret = -1; goto end; @@ -458,8 +458,8 @@ dtls1_connect(SSL *s) dtls1_start_timer(s); ret = ssl3_send_finished(s, SSL3_ST_CW_FINISHED_A, SSL3_ST_CW_FINISHED_B, - s->method->internal->ssl3_enc->client_finished_label, - s->method->internal->ssl3_enc->client_finished_label_len); + TLS_MD_CLIENT_FINISH_CONST, + TLS_MD_CLIENT_FINISH_CONST_SIZE); if (ret <= 0) goto end; s->internal->state = SSL3_ST_CW_FLUSH; |