summaryrefslogtreecommitdiffstats
path: root/ssl/statem
diff options
context:
space:
mode:
authorNikolay Morozov <nmorozoff77@yandex.ru>2020-05-02 12:22:43 +0300
committerDmitry Belyavskiy <beldmit@gmail.com>2020-05-07 16:14:47 +0300
commit90fc2c26df23811be080093772b2161850385863 (patch)
treea372be0919b9ba64d7606b50a1297b8dabbc5371 /ssl/statem
parent2b5e12f5096e1fba7dd91a682f4c34759469c34b (diff)
SSL_OP_DISABLE_TLSEXT_CA_NAMES option implementation
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/11709)
Diffstat (limited to 'ssl/statem')
-rw-r--r--ssl/statem/statem_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 262fe355f3..36cdc1be58 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -2342,7 +2342,7 @@ int construct_ca_names(SSL *s, const STACK_OF(X509_NAME) *ca_sk, WPACKET *pkt)
return 0;
}
- if (ca_sk != NULL) {
+ if ((ca_sk != NULL) && !(s->options & SSL_OP_DISABLE_TLSEXT_CA_NAMES)) {
int i;
for (i = 0; i < sk_X509_NAME_num(ca_sk); i++) {