- stevesk@cvs.openbsd.org 2002/08/21 19:38:06

[openssh.git] / dh.c

diff --git a/dh.c b/dh.c
index e691125e0a81dcb417618aefd9a0b42172f84cb2..6ec37867a0b0d1dc28c6bf1b9ae9b19fc4d1b6dd 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.22 2002/06/27 08:49:44 markus 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 */
@@ -208,10 +207,8 @@ 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++)