diff options
Diffstat (limited to 'src/lib/libssl/s3_clnt.c')
-rw-r--r-- | src/lib/libssl/s3_clnt.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c index e8cc0e3905..e44a025e57 100644 --- a/src/lib/libssl/s3_clnt.c +++ b/src/lib/libssl/s3_clnt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_clnt.c,v 1.171 2017/01/24 01:39:13 jsing Exp $ */ | 1 | /* $OpenBSD: s3_clnt.c,v 1.172 2017/01/24 14:57:31 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1723,8 +1723,7 @@ ssl3_get_certificate_request(SSL *s) | |||
1723 | /* we should setup a certificate to return.... */ | 1723 | /* we should setup a certificate to return.... */ |
1724 | S3I(s)->tmp.cert_req = 1; | 1724 | S3I(s)->tmp.cert_req = 1; |
1725 | S3I(s)->tmp.ctype_num = ctype_num; | 1725 | S3I(s)->tmp.ctype_num = ctype_num; |
1726 | if (S3I(s)->tmp.ca_names != NULL) | 1726 | sk_X509_NAME_pop_free(S3I(s)->tmp.ca_names, X509_NAME_free); |
1727 | sk_X509_NAME_pop_free(S3I(s)->tmp.ca_names, X509_NAME_free); | ||
1728 | S3I(s)->tmp.ca_names = ca_sk; | 1727 | S3I(s)->tmp.ca_names = ca_sk; |
1729 | ca_sk = NULL; | 1728 | ca_sk = NULL; |
1730 | 1729 | ||
@@ -1736,8 +1735,7 @@ truncated: | |||
1736 | } | 1735 | } |
1737 | err: | 1736 | err: |
1738 | X509_NAME_free(xn); | 1737 | X509_NAME_free(xn); |
1739 | if (ca_sk != NULL) | 1738 | sk_X509_NAME_pop_free(ca_sk, X509_NAME_free); |
1740 | sk_X509_NAME_pop_free(ca_sk, X509_NAME_free); | ||
1741 | return (ret); | 1739 | return (ret); |
1742 | } | 1740 | } |
1743 | 1741 | ||