diff options
Diffstat (limited to 'src/lib/libssl/s23_clnt.c')
-rw-r--r-- | src/lib/libssl/s23_clnt.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/libssl/s23_clnt.c b/src/lib/libssl/s23_clnt.c index 3a72dd3316..81683e5949 100644 --- a/src/lib/libssl/s23_clnt.c +++ b/src/lib/libssl/s23_clnt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s23_clnt.c,v 1.31 2014/07/11 08:17:36 miod Exp $ */ | 1 | /* $OpenBSD: s23_clnt.c,v 1.32 2014/08/10 14:42:56 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -139,8 +139,6 @@ const SSL_METHOD SSLv23_client_method_data = { | |||
139 | .ssl_dispatch_alert = ssl3_dispatch_alert, | 139 | .ssl_dispatch_alert = ssl3_dispatch_alert, |
140 | .ssl_ctrl = ssl3_ctrl, | 140 | .ssl_ctrl = ssl3_ctrl, |
141 | .ssl_ctx_ctrl = ssl3_ctx_ctrl, | 141 | .ssl_ctx_ctrl = ssl3_ctx_ctrl, |
142 | .get_cipher_by_char = ssl3_get_cipher_by_char, | ||
143 | .put_cipher_by_char = ssl23_put_cipher_by_char, | ||
144 | .ssl_pending = ssl_undefined_const_function, | 142 | .ssl_pending = ssl_undefined_const_function, |
145 | .num_ciphers = ssl3_num_ciphers, | 143 | .num_ciphers = ssl3_num_ciphers, |
146 | .get_cipher = ssl3_get_cipher, | 144 | .get_cipher = ssl3_get_cipher, |
@@ -360,8 +358,7 @@ ssl23_client_hello(SSL *s) | |||
360 | *(p++) = 0; | 358 | *(p++) = 0; |
361 | 359 | ||
362 | /* Ciphers supported (using SSL 3.0/TLS 1.0 format) */ | 360 | /* Ciphers supported (using SSL 3.0/TLS 1.0 format) */ |
363 | i = ssl_cipher_list_to_bytes(s, SSL_get_ciphers(s), &(p[2]), | 361 | i = ssl_cipher_list_to_bytes(s, SSL_get_ciphers(s), &p[2]); |
364 | ssl3_put_cipher_by_char); | ||
365 | if (i == 0) { | 362 | if (i == 0) { |
366 | SSLerr(SSL_F_SSL23_CLIENT_HELLO, | 363 | SSLerr(SSL_F_SSL23_CLIENT_HELLO, |
367 | SSL_R_NO_CIPHERS_AVAILABLE); | 364 | SSL_R_NO_CIPHERS_AVAILABLE); |