diff options
| author |   jsing <jsing@openbsd.org> | 2014-08-10 14:42:55 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-08-10 14:42:55 +0000 |
| commit | 3e6620b05005703104bc76bb7ab704a725e99897 (patch) | |
| tree | 43645363ec33870f6339e73eec118c9ae7acba82 /lib/libssl/src/ssl/t1_clnt.c | |
| parent | Ask for the descriptor size corresponding to the number of ports present (diff) | |
| download | wireguard-openbsd-3e6620b05005703104bc76bb7ab704a725e99897.tar.xz wireguard-openbsd-3e6620b05005703104bc76bb7ab704a725e99897.zip | |
Since we no longer need to support SSLv2-style cipher lists, start
unravelling the maze of function pointers and callbacks by directly
calling ssl3_{get,put}_cipher_by_char() and removing the
ssl_{get,put}_cipher_by_char macros.
Prompted by similar changes in boringssl.
ok guenther.
Diffstat (limited to 'lib/libssl/src/ssl/t1_clnt.c')
| -rw-r--r-- | lib/libssl/src/ssl/t1_clnt.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/libssl/src/ssl/t1_clnt.c b/lib/libssl/src/ssl/t1_clnt.c index 15ff91a8c4f..3781063eb66 100644 --- a/lib/libssl/src/ssl/t1_clnt.c +++ b/lib/libssl/src/ssl/t1_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_clnt.c,v 1.13 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: t1_clnt.c,v 1.14 2014/08/10 14:42:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -84,8 +84,6 @@ const SSL_METHOD TLSv1_client_method_data = { .ssl_dispatch_alert = ssl3_dispatch_alert, .ssl_ctrl = ssl3_ctrl, .ssl_ctx_ctrl = ssl3_ctx_ctrl, - .get_cipher_by_char = ssl3_get_cipher_by_char, - .put_cipher_by_char = ssl3_put_cipher_by_char, .ssl_pending = ssl3_pending, .num_ciphers = ssl3_num_ciphers, .get_cipher = ssl3_get_cipher, @@ -116,8 +114,6 @@ const SSL_METHOD TLSv1_1_client_method_data = { .ssl_dispatch_alert = ssl3_dispatch_alert, .ssl_ctrl = ssl3_ctrl, .ssl_ctx_ctrl = ssl3_ctx_ctrl, - .get_cipher_by_char = ssl3_get_cipher_by_char, - .put_cipher_by_char = ssl3_put_cipher_by_char, .ssl_pending = ssl3_pending, .num_ciphers = ssl3_num_ciphers, .get_cipher = ssl3_get_cipher, @@ -148,8 +144,6 @@ const SSL_METHOD TLSv1_2_client_method_data = { .ssl_dispatch_alert = ssl3_dispatch_alert, .ssl_ctrl = ssl3_ctrl, .ssl_ctx_ctrl = ssl3_ctx_ctrl, - .get_cipher_by_char = ssl3_get_cipher_by_char, - .put_cipher_by_char = ssl3_put_cipher_by_char, .ssl_pending = ssl3_pending, .num_ciphers = ssl3_num_ciphers, .get_cipher = ssl3_get_cipher, |