RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2010/04/23 22:48:31 

[ssh-keygen.c]
     refuse to generate keys longer than OPENSSL_[RD]SA_MAX_MODULUS_BITS,
     since we would refuse to use them anyway. bz#1516; ok dtucker@
This commit is contained in:
Damien Miller 2010-05-10 11:54:38 +10:00
parent 22a29880bb
commit bebbb7e8a5
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -15,6 +15,10 @@
set stderr to /dev/null for subsystems rather than just closing it. set stderr to /dev/null for subsystems rather than just closing it.
avoids hangs if a subsystem or shell initialisation writes to stderr. avoids hangs if a subsystem or shell initialisation writes to stderr.
bz#1750; ok markus@ bz#1750; ok markus@
- djm@cvs.openbsd.org 2010/04/23 22:48:31
[ssh-keygen.c]
refuse to generate keys longer than OPENSSL_[RD]SA_MAX_MODULUS_BITS,
since we would refuse to use them anyway. bz#1516; ok dtucker@
20100423 20100423
- (dtucker) [configure.ac] Bug #1756: Check for the existence of a lib64 dir - (dtucker) [configure.ac] Bug #1756: Check for the existence of a lib64 dir

9
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.188 2010/04/23 01:47:41 djm Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.189 2010/04/23 22:48:31 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1563,6 +1563,7 @@ main(int argc, char **argv)
struct passwd *pw; struct passwd *pw;
struct stat st; struct stat st;
int opt, type, fd; int opt, type, fd;
u_int maxbits;
u_int32_t memory = 0, generator_wanted = 0, trials = 100; u_int32_t memory = 0, generator_wanted = 0, trials = 100;
int do_gen_candidates = 0, do_screen_candidates = 0; int do_gen_candidates = 0, do_screen_candidates = 0;
BIGNUM *start = NULL; BIGNUM *start = NULL;
@ -1869,6 +1870,12 @@ main(int argc, char **argv)
} }
if (bits == 0) if (bits == 0)
bits = (type == KEY_DSA) ? DEFAULT_BITS_DSA : DEFAULT_BITS; bits = (type == KEY_DSA) ? DEFAULT_BITS_DSA : DEFAULT_BITS;
maxbits = (type == KEY_DSA) ?
OPENSSL_DSA_MAX_MODULUS_BITS : OPENSSL_RSA_MAX_MODULUS_BITS;
if (bits > maxbits) {
fprintf(stderr, "key bits exceeds maximum %d\n", maxbits);
exit(1);
}
if (type == KEY_DSA && bits != 1024) if (type == KEY_DSA && bits != 1024)
fatal("DSA keys must be 1024 bits"); fatal("DSA keys must be 1024 bits");
if (!quiet) if (!quiet)