From dc1680faabf16760930a0aa503fcbf0adacb369c Mon Sep 17 00:00:00 2001 From: miod <> Date: Wed, 15 Jul 2015 17:44:20 +0000 Subject: Remove dead code. Coverity CID 21688 ok beck@ --- src/lib/libcrypto/pkcs7/pk7_doit.c | 5 +---- src/lib/libssl/src/crypto/pkcs7/pk7_doit.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c index d0cf84df80..5631d35712 100644 --- a/src/lib/libcrypto/pkcs7/pk7_doit.c +++ b/src/lib/libcrypto/pkcs7/pk7_doit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pk7_doit.c,v 1.32 2015/03/19 14:00:22 tedu Exp $ */ +/* $OpenBSD: pk7_doit.c,v 1.33 2015/07/15 17:44:20 miod Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -631,7 +631,6 @@ PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert) goto err; } BIO_push(out, bio); - bio = NULL; if (0) { err: @@ -649,8 +648,6 @@ err: BIO_free_all(btmp); if (etmp != NULL) BIO_free_all(etmp); - if (bio != NULL) - BIO_free_all(bio); out = NULL; } return (out); diff --git a/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c b/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c index d0cf84df80..5631d35712 100644 --- a/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c +++ b/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pk7_doit.c,v 1.32 2015/03/19 14:00:22 tedu Exp $ */ +/* $OpenBSD: pk7_doit.c,v 1.33 2015/07/15 17:44:20 miod Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -631,7 +631,6 @@ PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert) goto err; } BIO_push(out, bio); - bio = NULL; if (0) { err: @@ -649,8 +648,6 @@ err: BIO_free_all(btmp); if (etmp != NULL) BIO_free_all(etmp); - if (bio != NULL) - BIO_free_all(bio); out = NULL; } return (out); -- cgit v1.2.3-55-g6feb