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.c10
3 files changed, 12 insertions, 2 deletions
diff --git a/src/lib/libssl/Symbols.list b/src/lib/libssl/Symbols.list
index 4508a362d1..bae1950899 100644
--- a/src/lib/libssl/Symbols.list
+++ b/src/lib/libssl/Symbols.list
@@ -189,6 +189,7 @@ SSL_get_certificate
189SSL_get_cipher_list 189SSL_get_cipher_list
190SSL_get_ciphers 190SSL_get_ciphers
191SSL_get_client_CA_list 191SSL_get_client_CA_list
192SSL_get_client_ciphers
192SSL_get_client_random 193SSL_get_client_random
193SSL_get_current_cipher 194SSL_get_current_cipher
194SSL_get_current_compression 195SSL_get_current_compression
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index ba5241850f..d440e0ccef 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.162 2018/11/11 06:58:14 tb Exp $ */ 1/* $OpenBSD: ssl.h,v 1.163 2019/01/22 01:12:18 tb 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 *
@@ -1437,6 +1437,7 @@ const SSL_METHOD *DTLSv1_server_method(void); /* DTLSv1.0 */
1437const SSL_METHOD *DTLSv1_client_method(void); /* DTLSv1.0 */ 1437const SSL_METHOD *DTLSv1_client_method(void); /* DTLSv1.0 */
1438 1438
1439STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *s); 1439STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *s);
1440STACK_OF(SSL_CIPHER) *SSL_get_client_ciphers(const SSL *s);
1440 1441
1441int SSL_do_handshake(SSL *s); 1442int SSL_do_handshake(SSL *s);
1442int SSL_renegotiate(SSL *s); 1443int SSL_renegotiate(SSL *s);
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index e3ab8431ab..839bead755 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.199 2019/01/21 14:12:13 tb Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.200 2019/01/22 01:12:18 tb 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 *
@@ -1255,6 +1255,14 @@ SSL_get_ciphers(const SSL *s)
1255 return (NULL); 1255 return (NULL);
1256} 1256}
1257 1257
1258STACK_OF(SSL_CIPHER) *
1259SSL_get_client_ciphers(const SSL *s)
1260{
1261 if (s == NULL || s->session == NULL || !s->server)
1262 return NULL;
1263 return s->session->ciphers;
1264}
1265
1258/* 1266/*
1259 * Return a STACK of the ciphers available for the SSL and in order of 1267 * Return a STACK of the ciphers available for the SSL and in order of
1260 * algorithm id. 1268 * algorithm id.