Eliminate a few "} else" branches, a few unneeded NULL checks before

freeing and indent nearby labels.

ok beck jsing

1 files changed, 9 insertions, 11 deletions

diff --git a/src/lib/libcrypto/dsa/dsa_key.c b/src/lib/libcrypto/dsa/dsa_key.c
index b2d08e5e0c..520b980983 100644
--- a/src/lib/libcrypto/dsa/dsa_key.c
+++ b/src/lib/libcrypto/dsa/dsa_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_key.c,v 1.24 2018/11/05 23:46:16 tb Exp $ */
+/* $OpenBSD: dsa_key.c,v 1.25 2018/11/05 23:50:05 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -82,27 +82,25 @@ dsa_builtin_keygen(DSA *dsa)
 {
         int ok = 0;
         BN_CTX *ctx = NULL;
-        BIGNUM *pub_key = NULL, *priv_key = NULL;
+        BIGNUM *pub_key = dsa->pub_key, *priv_key = dsa->priv_key;
 
         if ((ctx = BN_CTX_new()) == NULL)
                 goto err;
 
-        if (dsa->priv_key == NULL) {
+        if (priv_key == NULL) {
                 if ((priv_key = BN_new()) == NULL)
                         goto err;
-        } else
-                priv_key=dsa->priv_key;
+        }
 
         do {
                 if (!BN_rand_range(priv_key, dsa->q))
                         goto err;
         } while (BN_is_zero(priv_key));
 
-        if (dsa->pub_key == NULL) {
+        if (pub_key == NULL) {
                 if ((pub_key = BN_new()) == NULL)
                         goto err;
-        } else
-                pub_key=dsa->pub_key;
+        }
         
         if (!BN_mod_exp_ct(pub_key, dsa->g, priv_key, dsa->p, ctx))
                 goto err;
@@ -111,10 +109,10 @@ dsa_builtin_keygen(DSA *dsa)
         dsa->pub_key = pub_key;
         ok = 1;
 
-err:
-        if (pub_key != NULL && dsa->pub_key == NULL)
+ err:
+        if (dsa->pub_key == NULL)
                 BN_free(pub_key);
-        if (priv_key != NULL && dsa->priv_key == NULL)
+        if (dsa->priv_key == NULL)
                 BN_free(priv_key);
         BN_CTX_free(ctx);
         return ok;