summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libssl/Symbols.list1
-rw-r--r--src/lib/libssl/ssl.h3
-rw-r--r--src/lib/libssl/ssl_lib.c8
3 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/libssl/Symbols.list b/src/lib/libssl/Symbols.list
index 60e56396bf..8169cf8d66 100644
--- a/src/lib/libssl/Symbols.list
+++ b/src/lib/libssl/Symbols.list
@@ -59,6 +59,7 @@ SSL_CTX_free
59SSL_CTX_get0_certificate 59SSL_CTX_get0_certificate
60SSL_CTX_get0_param 60SSL_CTX_get0_param
61SSL_CTX_get_cert_store 61SSL_CTX_get_cert_store
62SSL_CTX_get_ciphers
62SSL_CTX_get_client_CA_list 63SSL_CTX_get_client_CA_list
63SSL_CTX_get_client_cert_cb 64SSL_CTX_get_client_cert_cb
64SSL_CTX_get_ex_data 65SSL_CTX_get_ex_data
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index c24c729bb2..7756a71230 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.142 2018/02/22 17:25:18 jsing Exp $ */ 1/* $OpenBSD: ssl.h,v 1.143 2018/02/22 17:27:07 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 *
@@ -1207,6 +1207,7 @@ BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx);
1207int BIO_ssl_copy_session_id(BIO *to, BIO *from); 1207int BIO_ssl_copy_session_id(BIO *to, BIO *from);
1208void BIO_ssl_shutdown(BIO *ssl_bio); 1208void BIO_ssl_shutdown(BIO *ssl_bio);
1209 1209
1210STACK_OF(SSL_CIPHER) *SSL_CTX_get_ciphers(const SSL_CTX *ctx);
1210int SSL_CTX_set_cipher_list(SSL_CTX *, const char *str); 1211int SSL_CTX_set_cipher_list(SSL_CTX *, const char *str);
1211SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth); 1212SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth);
1212void SSL_CTX_free(SSL_CTX *); 1213void SSL_CTX_free(SSL_CTX *);
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index e910d85914..941a230ab1 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_lib.c,v 1.176 2018/02/17 15:19:43 jsing Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.177 2018/02/22 17:27:07 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 *
@@ -1314,6 +1314,12 @@ SSL_get_cipher_list(const SSL *s, int n)
1314 return (c->name); 1314 return (c->name);
1315} 1315}
1316 1316
1317STACK_OF(SSL_CIPHER) *
1318SSL_CTX_get_ciphers(const SSL_CTX *ctx)
1319{
1320 return ctx->cipher_list;
1321}
1322
1317/* Specify the ciphers to be used by default by the SSL_CTX. */ 1323/* Specify the ciphers to be used by default by the SSL_CTX. */
1318int 1324int
1319SSL_CTX_set_cipher_list(SSL_CTX *ctx, const char *str) 1325SSL_CTX_set_cipher_list(SSL_CTX *ctx, const char *str)