mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-17 14:32:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete version test when returning CA names.

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2969)
This commit is contained in:
Dr. Stephen Henson 2017-03-16 15:28:07 +00:00
parent 07518cfb38
commit f8f16d8ea4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ssl/ssl_cert.c
View File

@ -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;
}
}