diff options
author | Darren Tucker <dtucker@zip.com.au> | 2009-10-07 09:01:50 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2009-10-07 09:01:50 +1100 |
commit | 759cb2a49aefe2757ec7b023024881f5d00efef5 (patch) | |
tree | 1ed1e01fed043092518f196430e2da8a58119256 | |
parent | 72473c6b09b61b5ea2a7bda7728062b89a46b394 (diff) |
- grunk@cvs.openbsd.org 2009/10/01 11:37:33
[dh.c]
fix a cast
ok djm@ markus@
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | dh.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -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 | ||
84 | 20091002 | 88 | 20091002 |
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. |
@@ -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 */ |