2 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 3af5bc887..ad9bad164 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20061108
+ - (dtucker) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2006/11/07 13:02:07
+     [dh.c]
+     BN_hex2bn returns int; from dtucker@
+
 20061107
  - (dtucker) [sshd.c] Use privsep_pw if we have it, but only require it
    if we absolutely need it.  Pointed out by Corinna, ok djm@
@@ -2605,4 +2611,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.4589 2006/11/07 23:01:36 dtucker Exp $
diff --git a/dh.c b/dh.c
index e708ff78b..78e230b9f 100644
--- a/dh.c
+++ b/dh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh.c,v 1.43 2006/11/06 21:25:28 markus Exp $ */
+/* $OpenBSD: dh.c,v 1.44 2006/11/07 13:02:07 markus Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  *
@@ -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);