diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-12-10 00:54:38 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-12-10 00:54:38 +1100 |
commit | 5cd9d443ef70e5c8bf8cc21bc6cc81298e18e863 (patch) | |
tree | 54167b9fb2c0509c109986dbb75ac4fc72bd10f2 | |
parent | a615314d3b784fbafff3ea72aaf7dc18cd23dbeb (diff) |
- dtucker@cvs.openbsd.org 2003/12/09 13:52:55
[moduli.c]
Prevent ssh-keygen -T from outputting moduli with a generator of 0, since
they can't be used for Diffie-Hellman. Assistance and ok djm@
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | moduli.c | 11 |
2 files changed, 15 insertions, 2 deletions
@@ -23,6 +23,10 @@ | |||
23 | - markus@cvs.openbsd.org 2003/12/08 11:00:47 | 23 | - markus@cvs.openbsd.org 2003/12/08 11:00:47 |
24 | [kexgexc.c] | 24 | [kexgexc.c] |
25 | print requested group size in debug; ok djm | 25 | print requested group size in debug; ok djm |
26 | - dtucker@cvs.openbsd.org 2003/12/09 13:52:55 | ||
27 | [moduli.c] | ||
28 | Prevent ssh-keygen -T from outputting moduli with a generator of 0, since | ||
29 | they can't be used for Diffie-Hellman. Assistance and ok djm@ | ||
26 | - (dtucker) [ssh-keyscan.c] Sync RCSIDs, missed in SSH_SSFDMAX change below. | 30 | - (dtucker) [ssh-keyscan.c] Sync RCSIDs, missed in SSH_SSFDMAX change below. |
27 | 31 | ||
28 | 20031208 | 32 | 20031208 |
@@ -1562,4 +1566,4 @@ | |||
1562 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1566 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1563 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1567 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1564 | 1568 | ||
1565 | $Id: ChangeLog,v 1.3138 2003/12/09 13:52:37 dtucker Exp $ | 1569 | $Id: ChangeLog,v 1.3139 2003/12/09 13:54:38 dtucker Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: moduli.c,v 1.3 2003/12/07 06:34:18 djm Exp $ */ | 1 | /* $OpenBSD: moduli.c,v 1.4 2003/12/09 13:52:55 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 1994 Phil Karn <karn@qualcomm.com> | 3 | * Copyright 1994 Phil Karn <karn@qualcomm.com> |
4 | * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> | 4 | * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> |
@@ -550,6 +550,15 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, | |||
550 | continue; | 550 | continue; |
551 | } | 551 | } |
552 | 552 | ||
553 | /* | ||
554 | * Primes with no known generator are useless for DH, so | ||
555 | * skip those. | ||
556 | */ | ||
557 | if (generator_known == 0) { | ||
558 | debug2("%10u: no known generator", count_in); | ||
559 | continue; | ||
560 | } | ||
561 | |||
553 | count_possible++; | 562 | count_possible++; |
554 | 563 | ||
555 | /* | 564 | /* |