summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ts
diff options
context:
space:
mode:
authormmcc <>2016-03-11 07:08:45 +0000
committermmcc <>2016-03-11 07:08:45 +0000
commit13f852f88b7f59607c91ef9ac8a34ae4e55e08ca (patch)
treeb799fc9672743546b69747e9e1d53d9423de380c /src/lib/libcrypto/ts
parente11a59757e997c4effb65f1ad3aa27df9dff42f5 (diff)
downloadopenbsd-13f852f88b7f59607c91ef9ac8a34ae4e55e08ca.tar.gz
openbsd-13f852f88b7f59607c91ef9ac8a34ae4e55e08ca.tar.bz2
openbsd-13f852f88b7f59607c91ef9ac8a34ae4e55e08ca.zip
X509_free(3) is NULL-safe, so remove NULL checks before its calls.
ok doug@
Diffstat (limited to 'src/lib/libcrypto/ts')
-rw-r--r--src/lib/libcrypto/ts/ts_rsp_sign.c5
1 files changed, 2 insertions, 3 deletions
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 @@
1/* $OpenBSD: ts_rsp_sign.c,v 1.19 2015/09/30 18:04:02 jsing Exp $ */ 1/* $OpenBSD: ts_rsp_sign.c,v 1.20 2016/03/11 07:08:45 mmcc Exp $ */
2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL 2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
3 * project 2002. 3 * project 2002.
4 */ 4 */
@@ -185,8 +185,7 @@ TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer)
185 TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE); 185 TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE);
186 return 0; 186 return 0;
187 } 187 }
188 if (ctx->signer_cert) 188 X509_free(ctx->signer_cert);
189 X509_free(ctx->signer_cert);
190 ctx->signer_cert = signer; 189 ctx->signer_cert = signer;
191 CRYPTO_add(&ctx->signer_cert->references, +1, CRYPTO_LOCK_X509); 190 CRYPTO_add(&ctx->signer_cert->references, +1, CRYPTO_LOCK_X509);
192 return 1; 191 return 1;