diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2017-03-16 15:28:07 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2017-03-16 18:07:19 +0000 |
| commit | f8f16d8ea48fd331d384dad3027a925e7dc90f0b (patch) | |
| tree | 0a07c0fd1c179dca379024fadfa542cd6c62f068 /ssl/ssl_cert.c | |
| parent | 07518cfb3883d1b6ad1d5a413c78a848b6e51177 (diff) | |
Remove obsolete version test when returning CA names.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2969)
Diffstat (limited to 'ssl/ssl_cert.c')
| -rw-r--r-- | ssl/ssl_cert.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; } } |