提交 f8f16d8e 编写于 作者: D Dr. Stephen Henson

Remove obsolete version test when returning CA names.

Reviewed-by: NRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2969)
上级 07518cfb
......@@ -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;
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册