From 3935f3d5bc0215b231fcd3c9f9ebd7cf653cfcde Mon Sep 17 00:00:00 2001
From: mmcc <>
Date: Fri, 11 Mar 2016 07:08:45 +0000
Subject: X509_free(3) is NULL-safe, so remove NULL checks before its calls.

ok doug@
---
 src/lib/libcrypto/ts/ts_rsp_sign.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/lib/libcrypto/ts')

diff --git a/src/lib/libcrypto/ts/ts_rsp_sign.c b/src/lib/libcrypto/ts/ts_rsp_sign.c
index 758d747384..f9e8c53cc8 100644
--- a/src/lib/libcrypto/ts/ts_rsp_sign.c
+++ b/src/lib/libcrypto/ts/ts_rsp_sign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts_rsp_sign.c,v 1.19 2015/09/30 18:04:02 jsing Exp $ */
+/* $OpenBSD: ts_rsp_sign.c,v 1.20 2016/03/11 07:08:45 mmcc Exp $ */
 /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
  * project 2002.
  */
@@ -185,8 +185,7 @@ TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer)
 		    TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE);
 		return 0;
 	}
-	if (ctx->signer_cert)
-		X509_free(ctx->signer_cert);
+	X509_free(ctx->signer_cert);
 	ctx->signer_cert = signer;
 	CRYPTO_add(&ctx->signer_cert->references, +1, CRYPTO_LOCK_X509);
 	return 1;
-- 
cgit v1.2.3-55-g6feb