From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 7 Nov 2006 13:02:59 +0000 (+1100)
Subject:  - (dtucker) [dh.c] Type fix for BN_hex2bn; ok markus@
X-Git-Tag: V_4_5_P1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fremotes%2Fanongit%2FV_4_5;p=thirdparty%2Fopenssh-portable.git

 - (dtucker) [dh.c] Type fix for BN_hex2bn; ok markus@
---

diff --git a/ChangeLog b/ChangeLog
index 3af5bc887..275559103 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
      dtucker@
  - (dtucker) [README contrib/{caldera,redhat,contrib}/openssh.spec] Bump
    versions.
+ - (dtucker) [dh.c] Type fix for BN_hex2bn; ok markus@
  - (dtucker) Release 4.5p1.
 
 20061105
@@ -2605,4 +2606,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4588 2006/11/07 12:27:34 dtucker Exp $
+$Id: ChangeLog,v 1.4588.2.1 2006/11/07 13:02:59 dtucker Exp $
diff --git a/dh.c b/dh.c
index e708ff78b..02b9a4081 100644
--- a/dh.c
+++ b/dh.c
@@ -254,9 +254,9 @@ dh_new_group_asc(const char *gen, const char *modulus)
 	if ((dh = DH_new()) == NULL)
 		fatal("dh_new_group_asc: DH_new");
 
-	if (BN_hex2bn(&dh->p, modulus) == NULL)
+	if (BN_hex2bn(&dh->p, modulus) == 0)
 		fatal("BN_hex2bn p");
-	if (BN_hex2bn(&dh->g, gen) == NULL)
+	if (BN_hex2bn(&dh->g, gen) == 0)
 		fatal("BN_hex2bn g");
 
 	return (dh);