diff options
author | Damien Miller <djm@mindrot.org> | 2010-09-10 11:17:38 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-09-10 11:17:38 +1000 |
commit | 6e9f680cd2bb19b96280e90adaef5a536d8ae160 (patch) | |
tree | 145b8863596d818a4c9519748dfa6cf2d0e83580 | |
parent | 5929c52f65fc2029fb9b496ccfa91bd4cecca0be (diff) |
- 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-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -24,6 +24,11 @@ | |||
24 | - markus@cvs.openbsd.org 2010/09/02 16:08:39 | 24 | - markus@cvs.openbsd.org 2010/09/02 16:08:39 |
25 | [ssh.c] | 25 | [ssh.c] |
26 | unbreak ControlPersist=yes for ControlMaster=yes; ok djm@ | 26 | unbreak ControlPersist=yes for ControlMaster=yes; ok djm@ |
27 | - naddy@cvs.openbsd.org 2010/09/02 17:21:50 | ||
28 | [ssh-keygen.c] | ||
29 | Switch ECDSA default key size to 256 bits, which according to RFC5656 | ||
30 | should still be better than our current RSA-2048 default. | ||
31 | ok djm@, markus@ | ||
27 | 32 | ||
28 | 20100831 | 33 | 20100831 |
29 | - OpenBSD CVS Sync | 34 | - 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 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.202 2010/09/02 16:07:25 markus Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.203 2010/09/02 17:21:50 naddy 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 |
@@ -57,7 +57,7 @@ | |||
57 | /* Number of bits in the RSA/DSA key. This value can be set on the command line. */ | 57 | /* Number of bits in the RSA/DSA key. This value can be set on the command line. */ |
58 | #define DEFAULT_BITS 2048 | 58 | #define DEFAULT_BITS 2048 |
59 | #define DEFAULT_BITS_DSA 1024 | 59 | #define DEFAULT_BITS_DSA 1024 |
60 | #define DEFAULT_BITS_ECDSA 521 | 60 | #define DEFAULT_BITS_ECDSA 256 |
61 | u_int32_t bits = 0; | 61 | u_int32_t bits = 0; |
62 | 62 | ||
63 | /* | 63 | /* |