summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-09-10 03:17:38 +0200
committerDamien Miller <djm@mindrot.org>2010-09-10 03:17:38 +0200
commit6e9f680cd2bb19b96280e90adaef5a536d8ae160 (patch)
tree145b8863596d818a4c9519748dfa6cf2d0e83580
parent - markus@cvs.openbsd.org 2010/09/02 16:08:39 (diff)
downloadopenssh-6e9f680cd2bb19b96280e90adaef5a536d8ae160.tar.xz
openssh-6e9f680cd2bb19b96280e90adaef5a536d8ae160.zip
- naddy@cvs.openbsd.org 2010/09/02 17:21:50
[ssh-keygen.c] Switch ECDSA default key size to 256 bits, which according to RFC5656 should still be better than our current RSA-2048 default. ok djm@, markus@
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keygen.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d90bf37c8..9372e4666 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,11 @@
- markus@cvs.openbsd.org 2010/09/02 16:08:39
[ssh.c]
unbreak ControlPersist=yes for ControlMaster=yes; ok djm@
+ - naddy@cvs.openbsd.org 2010/09/02 17:21:50
+ [ssh-keygen.c]
+ Switch ECDSA default key size to 256 bits, which according to RFC5656
+ should still be better than our current RSA-2048 default.
+ ok djm@, markus@
20100831
- OpenBSD CVS Sync
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 0abf10f61..43b8c7f97 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.202 2010/09/02 16:07:25 markus Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.203 2010/09/02 17:21:50 naddy Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -57,7 +57,7 @@
/* Number of bits in the RSA/DSA key. This value can be set on the command line. */
#define DEFAULT_BITS 2048
#define DEFAULT_BITS_DSA 1024
-#define DEFAULT_BITS_ECDSA 521
+#define DEFAULT_BITS_ECDSA 256
u_int32_t bits = 0;
/*