summaryrefslogtreecommitdiff
path: root/ssh-keygen.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2019-03-25 15:49:00 +0000
committerDamien Miller <djm@mindrot.org>2019-03-26 10:20:22 +1100
commitf47269ea67eb4ff87454bf0d2a03e55532786482 (patch)
tree751dc8d18f78e96ab72a5a472b22b04b5e426bd5 /ssh-keygen.c
parent62949c5b37af28d8490d94866e314a76be683a5e (diff)
upstream: Increase the default RSA key size to 3072 bits. Based on
the estimates from NIST Special Publication 800-57, 3k bits provides security equivalent to 128 bits which is the smallest symmetric cipher we enable by default. ok markus@ deraadt@ OpenBSD-Commit-ID: 461dd32ebe808f88f4fc3ec74749b0e6bef2276b
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r--ssh-keygen.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 5d0787728..5d256a159 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.327 2019/02/10 16:35:41 benno Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.328 2019/03/25 15:49:00 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -67,8 +67,11 @@
67# define DEFAULT_KEY_TYPE_NAME "ed25519" 67# define DEFAULT_KEY_TYPE_NAME "ed25519"
68#endif 68#endif
69 69
70/* Number of bits in the RSA/DSA key. This value can be set on the command line. */ 70/*
71#define DEFAULT_BITS 2048 71 * Default number of bits in the RSA/DSA key. This value can be overridden
72 * on the command line.
73 */
74#define DEFAULT_BITS 3072
72#define DEFAULT_BITS_DSA 1024 75#define DEFAULT_BITS_DSA 1024
73#define DEFAULT_BITS_ECDSA 256 76#define DEFAULT_BITS_ECDSA 256
74 77