From f8f16d8ea48fd331d384dad3027a925e7dc90f0b Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 16 Mar 2017 15:28:07 +0000 Subject: Remove obsolete version test when returning CA names. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/2969) --- ssl/ssl_cert.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ssl') diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 70aa697564..50b2e645a9 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -506,15 +506,15 @@ STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(const SSL_CTX *ctx) STACK_OF(X509_NAME) *SSL_get_client_CA_list(const SSL *s) { if (!s->server) { /* we are in the client */ - if (((s->version >> 8) == SSL3_VERSION_MAJOR) && (s->s3 != NULL)) - return (s->s3->tmp.ca_names); + if (s->s3 != NULL) + return s->s3->tmp.ca_names; else - return (NULL); + return NULL; } else { if (s->client_CA != NULL) - return (s->client_CA); + return s->client_CA; else - return (s->ctx->client_CA); + return s->ctx->client_CA; } } -- cgit v1.2.3