1 files changed, 65 insertions, 60 deletions

diff --git a/src/lib/libcrypto/dh/dh_check.c b/src/lib/libcrypto/dh/dh_check.c
index 71ea9c1683..1df8f4cdc7 100644
--- a/src/lib/libcrypto/dh/dh_check.c
+++ b/src/lib/libcrypto/dh/dh_check.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_check.c,v 1.10 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: dh_check.c,v 1.11 2014/07/09 13:26:47 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -61,7 +61,8 @@
 #include <openssl/bn.h>
 #include <openssl/dh.h>
 
-/* Check that p is a safe prime and
+/*
+ * Check that p is a safe prime and
  * if g is 2, 3 or 5, check that it is a suitable generator
  * where
  * for 2, p mod 24 == 11
@@ -70,73 +71,77 @@
  * should hold.
  */
 
-int DH_check(const DH *dh, int *ret)
-        {
-        int ok=0;
-        BN_CTX *ctx=NULL;
+int
+DH_check(const DH *dh, int *ret)
+{
+        int ok = 0;
+        BN_CTX *ctx = NULL;
         BN_ULONG l;
-        BIGNUM *q=NULL;
+        BIGNUM *q = NULL;
 
-        *ret=0;
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-        q=BN_new();
-        if (q == NULL) goto err;
+        *ret = 0;
+        ctx = BN_CTX_new();
+        if (ctx == NULL)
+                goto err;
+        q = BN_new();
+        if (q == NULL)
+                goto err;
 
-        if (BN_is_word(dh->g,DH_GENERATOR_2))
-                {
-                l=BN_mod_word(dh->p,24);
-                if (l != 11) *ret|=DH_NOT_SUITABLE_GENERATOR;
-                }
+        if (BN_is_word(dh->g, DH_GENERATOR_2)) {
+                l = BN_mod_word(dh->p, 24);
+                if (l != 11)
+                        *ret |= DH_NOT_SUITABLE_GENERATOR;
 #if 0
-        else if (BN_is_word(dh->g,DH_GENERATOR_3))
-                {
-                l=BN_mod_word(dh->p,12);
-                if (l != 5) *ret|=DH_NOT_SUITABLE_GENERATOR;
-                }
+        } else if (BN_is_word(dh->g, DH_GENERATOR_3)) {
+                l = BN_mod_word(dh->p, 12);
+                if (l != 5)
+                        *ret |= DH_NOT_SUITABLE_GENERATOR;
 #endif
-        else if (BN_is_word(dh->g,DH_GENERATOR_5))
-                {
-                l=BN_mod_word(dh->p,10);
-                if ((l != 3) && (l != 7))
-                        *ret|=DH_NOT_SUITABLE_GENERATOR;
-                }
-        else
-                *ret|=DH_UNABLE_TO_CHECK_GENERATOR;
+        } else if (BN_is_word(dh->g, DH_GENERATOR_5)) {
+                l = BN_mod_word(dh->p, 10);
+                if (l != 3 && l != 7)
+                        *ret |= DH_NOT_SUITABLE_GENERATOR;
+        } else
+                *ret |= DH_UNABLE_TO_CHECK_GENERATOR;
 
-        if (!BN_is_prime_ex(dh->p,BN_prime_checks,ctx,NULL))
-                *ret|=DH_CHECK_P_NOT_PRIME;
-        else
-                {
-                if (!BN_rshift1(q,dh->p)) goto err;
-                if (!BN_is_prime_ex(q,BN_prime_checks,ctx,NULL))
-                        *ret|=DH_CHECK_P_NOT_SAFE_PRIME;
-                }
-        ok=1;
-err:
-        if (ctx != NULL) BN_CTX_free(ctx);
-        if (q != NULL) BN_free(q);
-        return(ok);
+        if (!BN_is_prime_ex(dh->p, BN_prime_checks, ctx, NULL))
+                *ret |= DH_CHECK_P_NOT_PRIME;
+        else {
+                if (!BN_rshift1(q, dh->p))
+                        goto err;
+                if (!BN_is_prime_ex(q, BN_prime_checks, ctx, NULL))
+                        *ret |= DH_CHECK_P_NOT_SAFE_PRIME;
         }
+        ok = 1;
+err:
+        if (ctx != NULL)
+                BN_CTX_free(ctx);
+        if (q != NULL)
+                BN_free(q);
+        return ok;
+}
 
-int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *ret)
-        {
-        int ok=0;
-        BIGNUM *q=NULL;
+int
+DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *ret)
+{
+        int ok = 0;
+        BIGNUM *q = NULL;
 
-        *ret=0;
-        q=BN_new();
-        if (q == NULL) goto err;
-        BN_set_word(q,1);
-        if (BN_cmp(pub_key,q)<=0)
-                *ret|=DH_CHECK_PUBKEY_TOO_SMALL;
-        BN_copy(q,dh->p);
-        BN_sub_word(q,1);
-        if (BN_cmp(pub_key,q)>=0)
-                *ret|=DH_CHECK_PUBKEY_TOO_LARGE;
+        *ret = 0;
+        q = BN_new();
+        if (q == NULL)
+                goto err;
+        BN_set_word(q, 1);
+        if (BN_cmp(pub_key, q) <= 0)
+                *ret |= DH_CHECK_PUBKEY_TOO_SMALL;
+        BN_copy(q, dh->p);
+        BN_sub_word(q, 1);
+        if (BN_cmp(pub_key, q) >= 0)
+                *ret |= DH_CHECK_PUBKEY_TOO_LARGE;
 
         ok = 1;
 err:
-        if (q != NULL) BN_free(q);
-        return(ok);
-        }
+        if (q != NULL)
+                BN_free(q);
+        return ok;
+}