summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_cert.c
diff options
context:
space:
mode:
authorjsing <>2017-01-24 14:57:31 +0000
committerjsing <>2017-01-24 14:57:31 +0000
commit77a92585c62f2350be59692b9661aa7682960754 (patch)
tree011d7c934d9ef4ec841c1eca72c4ea94099316ff /src/lib/libssl/ssl_cert.c
parent72a17d80e1722d32d76a5acd4cf46bbc3a05f610 (diff)
downloadopenbsd-77a92585c62f2350be59692b9661aa7682960754.tar.gz
openbsd-77a92585c62f2350be59692b9661aa7682960754.tar.bz2
openbsd-77a92585c62f2350be59692b9661aa7682960754.zip
sk_pop_free() checks for NULL so do not bother doing it from the callers.
Diffstat (limited to 'src/lib/libssl/ssl_cert.c')
-rw-r--r--src/lib/libssl/ssl_cert.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index c23e789bf8..9ce8585d46 100644
--- a/src/lib/libssl/ssl_cert.c
+++ b/src/lib/libssl/ssl_cert.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_cert.c,v 1.58 2017/01/23 06:45:30 beck Exp $ */ 1/* $OpenBSD: ssl_cert.c,v 1.59 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 *
@@ -395,9 +395,7 @@ ssl_sess_cert_free(SESS_CERT *sc)
395 if (i > 0) 395 if (i > 0)
396 return; 396 return;
397 397
398 /* i == 0 */ 398 sk_X509_pop_free(sc->cert_chain, X509_free);
399 if (sc->cert_chain != NULL)
400 sk_X509_pop_free(sc->cert_chain, X509_free);
401 for (i = 0; i < SSL_PKEY_NUM; i++) 399 for (i = 0; i < SSL_PKEY_NUM; i++)
402 X509_free(sc->peer_pkeys[i].x509); 400 X509_free(sc->peer_pkeys[i].x509);
403 401
@@ -459,9 +457,7 @@ static void
459set_client_CA_list(STACK_OF(X509_NAME) **ca_list, 457set_client_CA_list(STACK_OF(X509_NAME) **ca_list,
460 STACK_OF(X509_NAME) *name_list) 458 STACK_OF(X509_NAME) *name_list)
461{ 459{
462 if (*ca_list != NULL) 460 sk_X509_NAME_pop_free(*ca_list, X509_NAME_free);
463 sk_X509_NAME_pop_free(*ca_list, X509_NAME_free);
464
465 *ca_list = name_list; 461 *ca_list = name_list;
466} 462}
467 463
@@ -611,8 +607,7 @@ SSL_load_client_CA_file(const char *file)
611 607
612 if (0) { 608 if (0) {
613err: 609err:
614 if (ret != NULL) 610 sk_X509_NAME_pop_free(ret, X509_NAME_free);
615 sk_X509_NAME_pop_free(ret, X509_NAME_free);
616 ret = NULL; 611 ret = NULL;
617 } 612 }
618 if (sk != NULL) 613 if (sk != NULL)