summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_srvr.c
diff options
context:
space:
mode:
authorjsing <>2015-02-06 08:30:23 +0000
committerjsing <>2015-02-06 08:30:23 +0000
commit970e6ec5cda1aae85293f7a4c40abbf0d9bc7457 (patch)
tree3d9e90980fb8319df5be140e688f4782d92d6aa1 /src/lib/libssl/s3_srvr.c
parenteba8dcd28b15b266761b836e8eeac404791cec35 (diff)
downloadopenbsd-970e6ec5cda1aae85293f7a4c40abbf0d9bc7457.tar.gz
openbsd-970e6ec5cda1aae85293f7a4c40abbf0d9bc7457.tar.bz2
openbsd-970e6ec5cda1aae85293f7a4c40abbf0d9bc7457.zip
Bring back the horrible API that is get_cipher_by_char/put_cipher_by_char.
This API was intended to be an internal only, however like many things in OpenSSL, it is exposed externally and parts of the software ecosystem are now using it since there is no real alternative within the public API. ok doug@, tedu@ and reluctantly miod@
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/s3_srvr.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index fd8f9aabab..e16eb6f5d0 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_srvr.c,v 1.96 2014/12/29 16:12:59 tedu Exp $ */ 1/* $OpenBSD: s3_srvr.c,v 1.97 2015/02/06 08:30:23 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 *
@@ -188,6 +188,8 @@ const SSL_METHOD SSLv3_server_method_data = {
188 .ssl_dispatch_alert = ssl3_dispatch_alert, 188 .ssl_dispatch_alert = ssl3_dispatch_alert,
189 .ssl_ctrl = ssl3_ctrl, 189 .ssl_ctrl = ssl3_ctrl,
190 .ssl_ctx_ctrl = ssl3_ctx_ctrl, 190 .ssl_ctx_ctrl = ssl3_ctx_ctrl,
191 .get_cipher_by_char = ssl3_get_cipher_by_char,
192 .put_cipher_by_char = ssl3_put_cipher_by_char,
191 .ssl_pending = ssl3_pending, 193 .ssl_pending = ssl3_pending,
192 .num_ciphers = ssl3_num_ciphers, 194 .num_ciphers = ssl3_num_ciphers,
193 .get_cipher = ssl3_get_cipher, 195 .get_cipher = ssl3_get_cipher,