summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-11-08 10:01:36 +1100
committerDarren Tucker <dtucker@zip.com.au>2006-11-08 10:01:36 +1100
commitb0781f79db208900b2d0fd4a1ee69e121bf37792 (patch)
treef6cab22be2c89423c83b0970707ae1a06c6dbe56
parent14ea86391b250aaa65cdff8ac4b2c092c6d8d90e (diff)
- markus@cvs.openbsd.org 2006/11/07 13:02:07
[dh.c] BN_hex2bn returns int; from dtucker@
-rw-r--r--ChangeLog8
-rw-r--r--dh.c6
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 @@
120061108
2 - (dtucker) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2006/11/07 13:02:07
4 [dh.c]
5 BN_hex2bn returns int; from dtucker@
6
120061107 720061107
2 - (dtucker) [sshd.c] Use privsep_pw if we have it, but only require it 8 - (dtucker) [sshd.c] Use privsep_pw if we have it, but only require it
3 if we absolutely need it. Pointed out by Corinna, ok djm@ 9 if we absolutely need it. Pointed out by Corinna, ok djm@
@@ -2605,4 +2611,4 @@
2605 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2611 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2606 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2612 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2607 2613
2608$Id: ChangeLog,v 1.4588 2006/11/07 12:27:34 dtucker Exp $ 2614$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 @@
1/* $OpenBSD: dh.c,v 1.43 2006/11/06 21:25:28 markus Exp $ */ 1/* $OpenBSD: dh.c,v 1.44 2006/11/07 13:02:07 markus Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Niels Provos. All rights reserved. 3 * Copyright (c) 2000 Niels Provos. All rights reserved.
4 * 4 *
@@ -254,9 +254,9 @@ dh_new_group_asc(const char *gen, const char *modulus)
254 if ((dh = DH_new()) == NULL) 254 if ((dh = DH_new()) == NULL)
255 fatal("dh_new_group_asc: DH_new"); 255 fatal("dh_new_group_asc: DH_new");
256 256
257 if (BN_hex2bn(&dh->p, modulus) == NULL) 257 if (BN_hex2bn(&dh->p, modulus) == 0)
258 fatal("BN_hex2bn p"); 258 fatal("BN_hex2bn p");
259 if (BN_hex2bn(&dh->g, gen) == NULL) 259 if (BN_hex2bn(&dh->g, gen) == 0)
260 fatal("BN_hex2bn g"); 260 fatal("BN_hex2bn g");
261 261
262 return (dh); 262 return (dh);