summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-10-07 09:01:50 +1100
committerDarren Tucker <dtucker@zip.com.au>2009-10-07 09:01:50 +1100
commit759cb2a49aefe2757ec7b023024881f5d00efef5 (patch)
tree1ed1e01fed043092518f196430e2da8a58119256
parent72473c6b09b61b5ea2a7bda7728062b89a46b394 (diff)
- grunk@cvs.openbsd.org 2009/10/01 11:37:33
[dh.c] fix a cast ok djm@ markus@
-rw-r--r--ChangeLog4
-rw-r--r--dh.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e961d1a2f..f2233fb9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,6 +80,10 @@
80 don't issue blocking read/write on agent sockets - just fall back to 80 don't issue blocking read/write on agent sockets - just fall back to
81 select() on retriable read/write errors. bz#1633 reported and tested 81 select() on retriable read/write errors. bz#1633 reported and tested
82 by "noodle10000 AT googlemail.com"; ok dtucker@ markus@ 82 by "noodle10000 AT googlemail.com"; ok dtucker@ markus@
83 - grunk@cvs.openbsd.org 2009/10/01 11:37:33
84 [dh.c]
85 fix a cast
86 ok djm@ markus@
83 87
8420091002 8820091002
85 - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps. 89 - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps.
diff --git a/dh.c b/dh.c
index b76605325..b9029d867 100644
--- a/dh.c
+++ b/dh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dh.c,v 1.47 2008/06/26 09:19:39 djm Exp $ */ 1/* $OpenBSD: dh.c,v 1.48 2009/10/01 11:37:33 grunk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Niels Provos. All rights reserved. 3 * Copyright (c) 2000 Niels Provos. All rights reserved.
4 * 4 *
@@ -83,7 +83,7 @@ parse_prime(int linenum, char *line, struct dhgroup *dhg)
83 goto fail; 83 goto fail;
84 strsize = strsep(&cp, " "); /* size */ 84 strsize = strsep(&cp, " "); /* size */
85 if (cp == NULL || *strsize == '\0' || 85 if (cp == NULL || *strsize == '\0' ||
86 (dhg->size = (u_int)strtonum(strsize, 0, 64*1024, &errstr)) == 0 || 86 (dhg->size = (int)strtonum(strsize, 0, 64*1024, &errstr)) == 0 ||
87 errstr) 87 errstr)
88 goto fail; 88 goto fail;
89 /* The whole group is one bit larger */ 89 /* The whole group is one bit larger */