diff options
| author | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
| commit | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch) | |
| tree | f0d13e1687800f36a3c4322b94ac5230ad17bdbf /dh.c | |
| parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
| parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) | |
merge 5.4p1
Diffstat (limited to 'dh.c')
| -rw-r--r-- | dh.c | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -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 */ |