summaryrefslogtreecommitdiffstats
path: root/lib/libssl
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2018-02-22 17:27:06 +0000
committerjsing <jsing@openbsd.org>2018-02-22 17:27:06 +0000
commit3730db37e7e2c5a8b65f086597444c027600080a (patch)
tree39564a223dbdb8ce3e229d38cc7326c749781ea2 /lib/libssl
parentProvide SSL_SESSION_up_ref(). (diff)
downloadwireguard-openbsd-3730db37e7e2c5a8b65f086597444c027600080a.tar.xz
wireguard-openbsd-3730db37e7e2c5a8b65f086597444c027600080a.zip
Provide SSL_CTX_get_ciphers().
Diffstat (limited to 'lib/libssl')
-rw-r--r--lib/libssl/Symbols.list1
-rw-r--r--lib/libssl/ssl.h3
-rw-r--r--lib/libssl/ssl_lib.c8
3 files changed, 10 insertions, 2 deletions
diff --git a/lib/libssl/Symbols.list b/lib/libssl/Symbols.list
index 60e56396bfa..8169cf8d668 100644
--- a/lib/libssl/Symbols.list
+++ b/lib/libssl/Symbols.list
@@ -59,6 +59,7 @@ SSL_CTX_free
SSL_CTX_get0_certificate
SSL_CTX_get0_param
SSL_CTX_get_cert_store
+SSL_CTX_get_ciphers
SSL_CTX_get_client_CA_list
SSL_CTX_get_client_cert_cb
SSL_CTX_get_ex_data
diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h
index c24c729bb26..7756a71230e 100644
--- a/lib/libssl/ssl.h
+++ b/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.142 2018/02/22 17:25:18 jsing Exp $ */
+/* $OpenBSD: ssl.h,v 1.143 2018/02/22 17:27:07 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -1207,6 +1207,7 @@ BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx);
int BIO_ssl_copy_session_id(BIO *to, BIO *from);
void BIO_ssl_shutdown(BIO *ssl_bio);
+STACK_OF(SSL_CIPHER) *SSL_CTX_get_ciphers(const SSL_CTX *ctx);
int SSL_CTX_set_cipher_list(SSL_CTX *, const char *str);
SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth);
void SSL_CTX_free(SSL_CTX *);
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c
index e910d85914f..941a230ab1f 100644
--- a/lib/libssl/ssl_lib.c
+++ b/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_lib.c,v 1.176 2018/02/17 15:19:43 jsing Exp $ */
+/* $OpenBSD: ssl_lib.c,v 1.177 2018/02/22 17:27:07 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -1314,6 +1314,12 @@ SSL_get_cipher_list(const SSL *s, int n)
return (c->name);
}
+STACK_OF(SSL_CIPHER) *
+SSL_CTX_get_ciphers(const SSL_CTX *ctx)
+{
+ return ctx->cipher_list;
+}
+
/* Specify the ciphers to be used by default by the SSL_CTX. */
int
SSL_CTX_set_cipher_list(SSL_CTX *ctx, const char *str)