12 files changed, 64 insertions, 110 deletions

diff --git a/src/lib/libcrypto/rsa/rsa_chk.c b/src/lib/libcrypto/rsa/rsa_chk.c
index 0f9e0944db..c247a8d80e 100644
--- a/src/lib/libcrypto/rsa/rsa_chk.c
+++ b/src/lib/libcrypto/rsa/rsa_chk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_chk.c,v 1.8 2014/07/09 19:51:38 jsing Exp $ */
+/* $OpenBSD: rsa_chk.c,v 1.9 2014/07/10 07:43:11 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
  *
@@ -52,7 +52,6 @@
 #include <openssl/err.h>
 #include <openssl/rsa.h>
 
-
 int
 RSA_check_key(const RSA *key)
 {
@@ -203,17 +202,12 @@ RSA_check_key(const RSA *key)
         }
 
 err:
-        if (i != NULL)
-                BN_free(i);
-        if (j != NULL)
-                BN_free(j);
-        if (k != NULL)
-                BN_free(k);
-        if (l != NULL)
-                BN_free(l);
-        if (m != NULL)
-                BN_free(m);
-        if (ctx != NULL)
-                BN_CTX_free(ctx);
+        BN_free(i);
+        BN_free(j);
+        BN_free(k);
+        BN_free(l);
+        BN_free(m);
+        BN_CTX_free(ctx);
+
         return (ret);
 }
diff --git a/src/lib/libcrypto/rsa/rsa_crpt.c b/src/lib/libcrypto/rsa/rsa_crpt.c
index fb09d235e1..c216c1bae4 100644
--- a/src/lib/libcrypto/rsa/rsa_crpt.c
+++ b/src/lib/libcrypto/rsa/rsa_crpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_crpt.c,v 1.6 2014/07/09 19:51:38 jsing Exp $ */
+/* $OpenBSD: rsa_crpt.c,v 1.7 2014/07/10 07:43:11 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -110,10 +110,8 @@ RSA_flags(const RSA *r)
 void
 RSA_blinding_off(RSA *rsa)
 {
-        if (rsa->blinding != NULL) {
-                BN_BLINDING_free(rsa->blinding);
-                rsa->blinding = NULL;
-        }
+        BN_BLINDING_free(rsa->blinding);
+        rsa->blinding = NULL;
         rsa->flags &= ~RSA_FLAG_BLINDING;
         rsa->flags |= RSA_FLAG_NO_BLINDING;
 }
diff --git a/src/lib/libcrypto/rsa/rsa_depr.c b/src/lib/libcrypto/rsa/rsa_depr.c
index 7a3ecca666..f66c832b2a 100644
--- a/src/lib/libcrypto/rsa/rsa_depr.c
+++ b/src/lib/libcrypto/rsa/rsa_depr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_depr.c,v 1.5 2014/07/09 19:51:38 jsing Exp $ */
+/* $OpenBSD: rsa_depr.c,v 1.6 2014/07/10 07:43:11 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
@@ -91,10 +91,9 @@ RSA_generate_key(int bits, unsigned long e_value,
                 return rsa;
         }
 err:
-        if (e)
-                BN_free(e);
-        if (rsa)
-                RSA_free(rsa);
+        BN_free(e);
+        RSA_free(rsa);
+
         return 0;
 }
 #endif
diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c
index ede772cb83..9b390fb8c0 100644
--- a/src/lib/libcrypto/rsa/rsa_eay.c
+++ b/src/lib/libcrypto/rsa/rsa_eay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_eay.c,v 1.31 2014/07/09 19:51:38 jsing Exp $ */
+/* $OpenBSD: rsa_eay.c,v 1.32 2014/07/10 07:43:11 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -898,12 +898,9 @@ RSA_eay_init(RSA *rsa)
 static int
 RSA_eay_finish(RSA *rsa)
 {
-        if (rsa->_method_mod_n != NULL)
-                BN_MONT_CTX_free(rsa->_method_mod_n);
-        if (rsa->_method_mod_p != NULL)
-                BN_MONT_CTX_free(rsa->_method_mod_p);
-        if (rsa->_method_mod_q != NULL)
-                BN_MONT_CTX_free(rsa->_method_mod_q);
+        BN_MONT_CTX_free(rsa->_method_mod_n);
+        BN_MONT_CTX_free(rsa->_method_mod_p);
+        BN_MONT_CTX_free(rsa->_method_mod_q);
 
         return 1;
 }
diff --git a/src/lib/libcrypto/rsa/rsa_lib.c b/src/lib/libcrypto/rsa/rsa_lib.c
index 5afed37825..6f378ba0c0 100644
--- a/src/lib/libcrypto/rsa/rsa_lib.c
+++ b/src/lib/libcrypto/rsa/rsa_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_lib.c,v 1.25 2014/07/09 19:51:38 jsing Exp $ */
+/* $OpenBSD: rsa_lib.c,v 1.26 2014/07/10 07:43:11 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -214,26 +214,16 @@ RSA_free(RSA *r)
 
         CRYPTO_free_ex_data(CRYPTO_EX_INDEX_RSA, r, &r->ex_data);
 
-        if (r->n != NULL)
-                BN_clear_free(r->n);
-        if (r->e != NULL)
-                BN_clear_free(r->e);
-        if (r->d != NULL)
-                BN_clear_free(r->d);
-        if (r->p != NULL)
-                BN_clear_free(r->p);
-        if (r->q != NULL)
-                BN_clear_free(r->q);
-        if (r->dmp1 != NULL)
-                BN_clear_free(r->dmp1);
-        if (r->dmq1 != NULL)
-                BN_clear_free(r->dmq1);
-        if (r->iqmp != NULL)
-                BN_clear_free(r->iqmp);
-        if (r->blinding != NULL)
-                BN_BLINDING_free(r->blinding);
-        if (r->mt_blinding != NULL)
-                BN_BLINDING_free(r->mt_blinding);
+        BN_clear_free(r->n);
+        BN_clear_free(r->e);
+        BN_clear_free(r->d);
+        BN_clear_free(r->p);
+        BN_clear_free(r->q);
+        BN_clear_free(r->dmp1);
+        BN_clear_free(r->dmq1);
+        BN_clear_free(r->iqmp);
+        BN_BLINDING_free(r->blinding);
+        BN_BLINDING_free(r->mt_blinding);
         free(r);
 }
 
diff --git a/src/lib/libcrypto/rsa/rsa_pmeth.c b/src/lib/libcrypto/rsa/rsa_pmeth.c
index f35b5800ab..e083ded40c 100644
--- a/src/lib/libcrypto/rsa/rsa_pmeth.c
+++ b/src/lib/libcrypto/rsa/rsa_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_pmeth.c,v 1.10 2014/07/09 19:51:38 jsing Exp $ */
+/* $OpenBSD: rsa_pmeth.c,v 1.11 2014/07/10 07:43:11 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -151,8 +151,7 @@ pkey_rsa_cleanup(EVP_PKEY_CTX *ctx)
         RSA_PKEY_CTX *rctx = ctx->data;
 
         if (rctx) {
-                if (rctx->pub_exp)
-                        BN_free(rctx->pub_exp);
+                BN_free(rctx->pub_exp);
                 free(rctx->tbuf);
                 free(rctx);
         }
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_chk.c b/src/lib/libssl/src/crypto/rsa/rsa_chk.c
index 0f9e0944db..c247a8d80e 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_chk.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_chk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_chk.c,v 1.8 2014/07/09 19:51:38 jsing Exp $ */
+/* $OpenBSD: rsa_chk.c,v 1.9 2014/07/10 07:43:11 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
  *
@@ -52,7 +52,6 @@
 #include <openssl/err.h>
 #include <openssl/rsa.h>
 
-
 int
 RSA_check_key(const RSA *key)
 {
@@ -203,17 +202,12 @@ RSA_check_key(const RSA *key)
         }
 
 err:
-        if (i != NULL)
-                BN_free(i);
-        if (j != NULL)
-                BN_free(j);
-        if (k != NULL)
-                BN_free(k);
-        if (l != NULL)
-                BN_free(l);
-        if (m != NULL)
-                BN_free(m);
-        if (ctx != NULL)
-                BN_CTX_free(ctx);
+        BN_free(i);
+        BN_free(j);
+        BN_free(k);
+        BN_free(l);
+        BN_free(m);
+        BN_CTX_free(ctx);
+
         return (ret);
 }
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_crpt.c b/src/lib/libssl/src/crypto/rsa/rsa_crpt.c
index fb09d235e1..c216c1bae4 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_crpt.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_crpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_crpt.c,v 1.6 2014/07/09 19:51:38 jsing Exp $ */
+/* $OpenBSD: rsa_crpt.c,v 1.7 2014/07/10 07:43:11 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -110,10 +110,8 @@ RSA_flags(const RSA *r)
 void
 RSA_blinding_off(RSA *rsa)
 {
-        if (rsa->blinding != NULL) {
-                BN_BLINDING_free(rsa->blinding);
-                rsa->blinding = NULL;
-        }
+        BN_BLINDING_free(rsa->blinding);
+        rsa->blinding = NULL;
         rsa->flags &= ~RSA_FLAG_BLINDING;
         rsa->flags |= RSA_FLAG_NO_BLINDING;
 }
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_depr.c b/src/lib/libssl/src/crypto/rsa/rsa_depr.c
index 7a3ecca666..f66c832b2a 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_depr.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_depr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_depr.c,v 1.5 2014/07/09 19:51:38 jsing Exp $ */
+/* $OpenBSD: rsa_depr.c,v 1.6 2014/07/10 07:43:11 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
@@ -91,10 +91,9 @@ RSA_generate_key(int bits, unsigned long e_value,
                 return rsa;
         }
 err:
-        if (e)
-                BN_free(e);
-        if (rsa)
-                RSA_free(rsa);
+        BN_free(e);
+        RSA_free(rsa);
+
         return 0;
 }
 #endif
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_eay.c b/src/lib/libssl/src/crypto/rsa/rsa_eay.c
index ede772cb83..9b390fb8c0 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_eay.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_eay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_eay.c,v 1.31 2014/07/09 19:51:38 jsing Exp $ */
+/* $OpenBSD: rsa_eay.c,v 1.32 2014/07/10 07:43:11 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -898,12 +898,9 @@ RSA_eay_init(RSA *rsa)
 static int
 RSA_eay_finish(RSA *rsa)
 {
-        if (rsa->_method_mod_n != NULL)
-                BN_MONT_CTX_free(rsa->_method_mod_n);
-        if (rsa->_method_mod_p != NULL)
-                BN_MONT_CTX_free(rsa->_method_mod_p);
-        if (rsa->_method_mod_q != NULL)
-                BN_MONT_CTX_free(rsa->_method_mod_q);
+        BN_MONT_CTX_free(rsa->_method_mod_n);
+        BN_MONT_CTX_free(rsa->_method_mod_p);
+        BN_MONT_CTX_free(rsa->_method_mod_q);
 
         return 1;
 }
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_lib.c b/src/lib/libssl/src/crypto/rsa/rsa_lib.c
index 5afed37825..6f378ba0c0 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_lib.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_lib.c,v 1.25 2014/07/09 19:51:38 jsing Exp $ */
+/* $OpenBSD: rsa_lib.c,v 1.26 2014/07/10 07:43:11 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -214,26 +214,16 @@ RSA_free(RSA *r)
 
         CRYPTO_free_ex_data(CRYPTO_EX_INDEX_RSA, r, &r->ex_data);
 
-        if (r->n != NULL)
-                BN_clear_free(r->n);
-        if (r->e != NULL)
-                BN_clear_free(r->e);
-        if (r->d != NULL)
-                BN_clear_free(r->d);
-        if (r->p != NULL)
-                BN_clear_free(r->p);
-        if (r->q != NULL)
-                BN_clear_free(r->q);
-        if (r->dmp1 != NULL)
-                BN_clear_free(r->dmp1);
-        if (r->dmq1 != NULL)
-                BN_clear_free(r->dmq1);
-        if (r->iqmp != NULL)
-                BN_clear_free(r->iqmp);
-        if (r->blinding != NULL)
-                BN_BLINDING_free(r->blinding);
-        if (r->mt_blinding != NULL)
-                BN_BLINDING_free(r->mt_blinding);
+        BN_clear_free(r->n);
+        BN_clear_free(r->e);
+        BN_clear_free(r->d);
+        BN_clear_free(r->p);
+        BN_clear_free(r->q);
+        BN_clear_free(r->dmp1);
+        BN_clear_free(r->dmq1);
+        BN_clear_free(r->iqmp);
+        BN_BLINDING_free(r->blinding);
+        BN_BLINDING_free(r->mt_blinding);
         free(r);
 }
 
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_pmeth.c b/src/lib/libssl/src/crypto/rsa/rsa_pmeth.c
index f35b5800ab..e083ded40c 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_pmeth.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_pmeth.c,v 1.10 2014/07/09 19:51:38 jsing Exp $ */
+/* $OpenBSD: rsa_pmeth.c,v 1.11 2014/07/10 07:43:11 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -151,8 +151,7 @@ pkey_rsa_cleanup(EVP_PKEY_CTX *ctx)
         RSA_PKEY_CTX *rctx = ctx->data;
 
         if (rctx) {
-                if (rctx->pub_exp)
-                        BN_free(rctx->pub_exp);
+                BN_free(rctx->pub_exp);
                 free(rctx->tbuf);
                 free(rctx);
         }