if (x) FOO_free(x) -> FOO_free(x).

Improves readability, keeps the code smaller so that it is warmer in your
cache.

review & ok deraadt@

2 files changed, 6 insertions, 10 deletions

diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c
index 4556949456..cc6fd97b9d 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.27 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: pk7_doit.c,v 1.28 2014/07/12 16:03:37 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -184,10 +184,8 @@ pkcs7_encode_rinfo(PKCS7_RECIP_INFO *ri, unsigned char *key, int keylen)
         ret = 1;
 
 err:
-        if (pkey)
-                EVP_PKEY_free(pkey);
-        if (pctx)
-                EVP_PKEY_CTX_free(pctx);
+        EVP_PKEY_free(pkey);
+        EVP_PKEY_CTX_free(pctx);
         free(ek);
         return ret;
 }
@@ -244,8 +242,7 @@ pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen, PKCS7_RECIP_INFO *ri,
         *peklen = eklen;
 
 err:
-        if (pctx)
-                EVP_PKEY_CTX_free(pctx);
+        EVP_PKEY_CTX_free(pctx);
         if (!ret && ek)
                 free(ek);
 
diff --git a/src/lib/libcrypto/pkcs7/pk7_lib.c b/src/lib/libcrypto/pkcs7/pk7_lib.c
index 699f5df394..27370800c9 100644
--- a/src/lib/libcrypto/pkcs7/pk7_lib.c
+++ b/src/lib/libcrypto/pkcs7/pk7_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pk7_lib.c,v 1.13 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: pk7_lib.c,v 1.14 2014/07/12 16:03:37 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -575,8 +575,7 @@ PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
         return 1;
 
 err:
-        if (pkey)
-                EVP_PKEY_free(pkey);
+        EVP_PKEY_free(pkey);
         return 0;
 }