- markus@cvs.openbsd.org 2003/05/11 20:30:25

[openssh.git] / dh.c

diff --git a/dh.c b/dh.c
index e691125e0a81dcb417618aefd9a0b42172f84cb2..996428b7fc8632aa0ff656e5268677342429c666 100644 (file)
--- a/dh.c
+++ b/dh.c
@@ -23,14 +23,13 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: dh.c,v 1.20 2002/03/06 00:20:54 markus Exp $");
+RCSID("$OpenBSD: dh.c,v 1.24 2003/04/08 20:21:28 itojun Exp $");
 
 #include "xmalloc.h"
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>
 #include <openssl/evp.h>
-#include <openssl/err.h>
 
 #include "buffer.h"
 #include "cipher.h"
@@ -51,7 +50,7 @@ parse_prime(int linenum, char *line, struct dhgroup *dhg)
        /* Ignore leading whitespace */
        if (*arg == '\0')
                arg = strdelim(&cp);
-       if (!*arg || *arg == '#')
+       if (!arg || !*arg || *arg == '#')
                return 0;
 
        /* time */
@@ -113,7 +112,7 @@ choose_dh(int min, int wantbits, int max)
 
        if ((f = fopen(_PATH_DH_MODULI, "r")) == NULL &&
            (f = fopen(_PATH_DH_PRIMES, "r")) == NULL) {
-               log("WARNING: %s does not exist, using old modulus", _PATH_DH_MODULI);
+               logit("WARNING: %s does not exist, using old modulus", _PATH_DH_MODULI);
                return (dh_new_group1());
        }
 
@@ -141,7 +140,7 @@ choose_dh(int min, int wantbits, int max)
 
        if (bestcount == 0) {
                fclose(f);
-               log("WARNING: no suitable primes in %s", _PATH_DH_PRIMES);
+               logit("WARNING: no suitable primes in %s", _PATH_DH_PRIMES);
                return (NULL);
        }
 
@@ -177,18 +176,18 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub)
        int bits_set = 0;
 
        if (dh_pub->neg) {
-               log("invalid public DH value: negativ");
+               logit("invalid public DH value: negativ");
                return 0;
        }
        for (i = 0; i <= n; i++)
                if (BN_is_bit_set(dh_pub, i))
                        bits_set++;
-       debug("bits set: %d/%d", bits_set, BN_num_bits(dh->p));
+       debug2("bits set: %d/%d", bits_set, BN_num_bits(dh->p));
 
        /* if g==2 and bits_set==1 then computing log_g(dh_pub) is trivial */
        if (bits_set > 1 && (BN_cmp(dh_pub, dh->p) == -1))
                return 1;
-       log("invalid public DH value (%d/%d)", bits_set, BN_num_bits(dh->p));
+       logit("invalid public DH value (%d/%d)", bits_set, BN_num_bits(dh->p));
        return 0;
 }
 
@@ -208,16 +207,14 @@ dh_gen_key(DH *dh, int need)
                if ((dh->priv_key = BN_new()) == NULL)
                        fatal("dh_gen_key: BN_new failed");
                /* generate a 2*need bits random private exponent */
-               if (!BN_rand(dh->priv_key, 2*need, 0, 0)) {
-                       int ecode = ERR_get_error();
-                       fatal("dh_gen_key: BN_rand failed: %s", ERR_error_string(ecode, NULL));
-               }
+               if (!BN_rand(dh->priv_key, 2*need, 0, 0))
+                       fatal("dh_gen_key: BN_rand failed");
                if (DH_generate_key(dh) == 0)
                        fatal("DH_generate_key");
                for (i = 0; i <= BN_num_bits(dh->priv_key); i++)
                        if (BN_is_bit_set(dh->priv_key, i))
                                bits_set++;
-               debug("dh_gen_key: priv key bits set: %d/%d",
+               debug2("dh_gen_key: priv key bits set: %d/%d",
                    bits_set, BN_num_bits(dh->priv_key));
                if (tries++ > 10)
                        fatal("dh_gen_key: too many bad keys: giving up");