From bd68e8ca28679b15d2f2db1e696ed66903f425a6 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Tue, 22 Jan 2019 01:12:18 +0000
Subject: Provide SSL_get_client_ciphers(). Part of OpenSSL 1.1 API,
 pre-licence change.

ok jsing
---
 src/lib/libssl/Symbols.list |  1 +
 src/lib/libssl/ssl.h        |  3 ++-
 src/lib/libssl/ssl_lib.c    | 10 +++++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src')

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
 SSL_get_cipher_list
 SSL_get_ciphers
 SSL_get_client_CA_list
+SSL_get_client_ciphers
 SSL_get_client_random
 SSL_get_current_cipher
 SSL_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 @@
-/* $OpenBSD: ssl.h,v 1.162 2018/11/11 06:58:14 tb Exp $ */
+/* $OpenBSD: ssl.h,v 1.163 2019/01/22 01:12:18 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1437,6 +1437,7 @@ const SSL_METHOD *DTLSv1_server_method(void);	/* DTLSv1.0 */
 const SSL_METHOD *DTLSv1_client_method(void);	/* DTLSv1.0 */
 
 STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *s);
+STACK_OF(SSL_CIPHER) *SSL_get_client_ciphers(const SSL *s);
 
 int SSL_do_handshake(SSL *s);
 int 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 @@
-/* $OpenBSD: ssl_lib.c,v 1.199 2019/01/21 14:12:13 tb Exp $ */
+/* $OpenBSD: ssl_lib.c,v 1.200 2019/01/22 01:12:18 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1255,6 +1255,14 @@ SSL_get_ciphers(const SSL *s)
 	return (NULL);
 }
 
+STACK_OF(SSL_CIPHER) *
+SSL_get_client_ciphers(const SSL *s)
+{
+	if (s == NULL || s->session == NULL || !s->server)
+		return NULL;
+	return s->session->ciphers;
+}
+
 /*
  * Return a STACK of the ciphers available for the SSL and in order of
  * algorithm id.
-- 
cgit v1.2.3-55-g6feb