summaryrefslogtreecommitdiffstats
path: root/lib/libssl/t1_meth.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2015-02-06 08:30:23 +0000
committerjsing <jsing@openbsd.org>2015-02-06 08:30:23 +0000
commitbdb3203319c116e7ce03edb52e5cf9d07b6e6ec6 (patch)
tree54d5810bf04e660b987098d9eb04e8be1362db30 /lib/libssl/t1_meth.c
parentbetter error reporting for .br .fi .nf with arguments (diff)
downloadwireguard-openbsd-bdb3203319c116e7ce03edb52e5cf9d07b6e6ec6.tar.xz
wireguard-openbsd-bdb3203319c116e7ce03edb52e5cf9d07b6e6ec6.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 'lib/libssl/t1_meth.c')
-rw-r--r--lib/libssl/t1_meth.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/libssl/t1_meth.c b/lib/libssl/t1_meth.c
index 71d957fca99..48341525d8d 100644
--- a/lib/libssl/t1_meth.c
+++ b/lib/libssl/t1_meth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_meth.c,v 1.15 2014/12/14 15:30:50 jsing Exp $ */
+/* $OpenBSD: t1_meth.c,v 1.16 2015/02/06 08:30:23 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -83,6 +83,8 @@ const SSL_METHOD TLSv1_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,
@@ -113,6 +115,8 @@ const SSL_METHOD TLSv1_1_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,
@@ -143,6 +147,8 @@ const SSL_METHOD TLSv1_2_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,