summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker <dtucker>2009-10-06 22:01:50 +0000
committerdtucker <dtucker>2009-10-06 22:01:50 +0000
commit539da8aeb74b8ac755aeb378e936f5125af4613e (patch)
tree290a4f91948d397833324edfa9960b0f91523974
parent1e63954846d43fcbf23a2d984dfb50266acaaddf (diff)
downloadopenssh-539da8aeb74b8ac755aeb378e936f5125af4613e.tar.gz
- 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 e961d1a2..f2233fb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,6 +80,10 @@
don't issue blocking read/write on agent sockets - just fall back to
select() on retriable read/write errors. bz#1633 reported and tested
by "noodle10000 AT googlemail.com"; ok dtucker@ markus@
+ - grunk@cvs.openbsd.org 2009/10/01 11:37:33
+ [dh.c]
+ fix a cast
+ ok djm@ markus@
20091002
- (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps.
diff --git a/dh.c b/dh.c
index b7660532..b9029d86 100644
--- a/dh.c
+++ b/dh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh.c,v 1.47 2008/06/26 09:19:39 djm Exp $ */
+/* $OpenBSD: dh.c,v 1.48 2009/10/01 11:37:33 grunk Exp $ */
/*
* Copyright (c) 2000 Niels Provos. All rights reserved.
*
@@ -83,7 +83,7 @@ parse_prime(int linenum, char *line, struct dhgroup *dhg)
goto fail;
strsize = strsep(&cp, " "); /* size */
if (cp == NULL || *strsize == '\0' ||
- (dhg->size = (u_int)strtonum(strsize, 0, 64*1024, &errstr)) == 0 ||
+ (dhg->size = (int)strtonum(strsize, 0, 64*1024, &errstr)) == 0 ||
errstr)
goto fail;
/* The whole group is one bit larger */