- markus@cvs.openbsd.org 2006/11/07 13:02:07

     [dh.c]
     BN_hex2bn returns int; from dtucker@

diff --git a/ChangeLog b/ChangeLog
index 3c39282fb839d343fa91455ae3aed264257f1b9a..e40a7f10b86ffb289534bf88e4d24c4da1be8d68 100644 (file)
--- 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@

diff --git a/dh.c b/dh.c
index e708ff78b670656357bde1a504cf295fb2beeb29..78e230b9f2417c4233748c8e5fb6606167284843 100644 (file)
--- 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);