From 77a92585c62f2350be59692b9661aa7682960754 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Tue, 24 Jan 2017 14:57:31 +0000
Subject: sk_pop_free() checks for NULL so do not bother doing it from the
 callers.

---
 src/lib/libssl/ssl_rsa.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/lib/libssl/ssl_rsa.c')

diff --git a/src/lib/libssl/ssl_rsa.c b/src/lib/libssl/ssl_rsa.c
index 82c8cc0a87..03eedc0d8a 100644
--- a/src/lib/libssl/ssl_rsa.c
+++ b/src/lib/libssl/ssl_rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_rsa.c,v 1.24 2017/01/23 22:34:38 beck Exp $ */
+/* $OpenBSD: ssl_rsa.c,v 1.25 2017/01/24 14:57:31 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -671,10 +671,8 @@ ssl_ctx_use_certificate_chain_bio(SSL_CTX *ctx, BIO *in)
 		int r;
 		unsigned long err;
 
-		if (ctx->extra_certs != NULL) {
-			sk_X509_pop_free(ctx->extra_certs, X509_free);
-			ctx->extra_certs = NULL;
-		}
+		sk_X509_pop_free(ctx->extra_certs, X509_free);
+		ctx->extra_certs = NULL;
 
 		while ((ca = PEM_read_bio_X509(in, NULL,
 		    ctx->default_passwd_callback,
-- 
cgit v1.2.3-55-g6feb