diff options
Diffstat (limited to 'src/lib/libssl/d1_clnt.c')
-rw-r--r-- | src/lib/libssl/d1_clnt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c index c9ec32173b..471871ff46 100644 --- a/src/lib/libssl/d1_clnt.c +++ b/src/lib/libssl/d1_clnt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: d1_clnt.c,v 1.33 2014/08/07 20:02:23 miod Exp $ */ | 1 | /* $OpenBSD: d1_clnt.c,v 1.34 2014/08/10 14:42:55 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. |
@@ -145,8 +145,6 @@ const SSL_METHOD DTLSv1_client_method_data = { | |||
145 | .ssl_dispatch_alert = dtls1_dispatch_alert, | 145 | .ssl_dispatch_alert = dtls1_dispatch_alert, |
146 | .ssl_ctrl = dtls1_ctrl, | 146 | .ssl_ctrl = dtls1_ctrl, |
147 | .ssl_ctx_ctrl = ssl3_ctx_ctrl, | 147 | .ssl_ctx_ctrl = ssl3_ctx_ctrl, |
148 | .get_cipher_by_char = ssl3_get_cipher_by_char, | ||
149 | .put_cipher_by_char = ssl3_put_cipher_by_char, | ||
150 | .ssl_pending = ssl3_pending, | 148 | .ssl_pending = ssl3_pending, |
151 | .num_ciphers = ssl3_num_ciphers, | 149 | .num_ciphers = ssl3_num_ciphers, |
152 | .get_cipher = dtls1_get_cipher, | 150 | .get_cipher = dtls1_get_cipher, |
@@ -820,7 +818,7 @@ dtls1_client_hello(SSL *s) | |||
820 | p += s->d1->cookie_len; | 818 | p += s->d1->cookie_len; |
821 | 819 | ||
822 | /* Ciphers supported */ | 820 | /* Ciphers supported */ |
823 | i = ssl_cipher_list_to_bytes(s, SSL_get_ciphers(s), &(p[2]), 0); | 821 | i = ssl_cipher_list_to_bytes(s, SSL_get_ciphers(s), &p[2]); |
824 | if (i == 0) { | 822 | if (i == 0) { |
825 | SSLerr(SSL_F_DTLS1_CLIENT_HELLO, | 823 | SSLerr(SSL_F_DTLS1_CLIENT_HELLO, |
826 | SSL_R_NO_CIPHERS_AVAILABLE); | 824 | SSL_R_NO_CIPHERS_AVAILABLE); |