From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 20 Mar 2017 18:33:54 +0000 (+0000)
Subject: Don't use client specific functions to retrieve CA list
X-Git-Tag: OpenSSL_1_1_1-pre1~1870
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9784ec04745a8c8ecbf5610c0a2f5540e1e0f2cd;p=oweals%2Fopenssl.git

Don't use client specific functions to retrieve CA list

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3015)
---

diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index 22669dd565..96c5394bd6 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -992,7 +992,7 @@ static int tls_construct_certificate_authorities(SSL *s, WPACKET *pkt,
                                                  unsigned int context, X509 *x,
                                                  size_t chainidx, int *al)
 {
-    STACK_OF(X509_NAME) *ca_sk = SSL_get_client_CA_list(s);
+    const STACK_OF(X509_NAME) *ca_sk = SSL_get0_CA_list(s);
 
     if (ca_sk == NULL || sk_X509_NAME_num(ca_sk) == 0)
         return 1;
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index e3fc7e8b1e..f292b829bb 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -2038,7 +2038,7 @@ int parse_ca_names(SSL *s, PACKET *pkt, int *al)
 
 int construct_ca_names(SSL *s, WPACKET *pkt)
 {
-    STACK_OF(X509_NAME) *ca_sk = SSL_get_client_CA_list(s);
+    const STACK_OF(X509_NAME) *ca_sk = SSL_get0_CA_list(s);
 
     /* Start sub-packet for client CA list */
     if (!WPACKET_start_sub_packet_u16(pkt))