diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2013-12-29 02:28:11 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2013-12-29 02:28:11 +0000 |
| commit | 00c33e818e92d1a3fbec07c3a94f183c1a9ff513 (patch) | |
| tree | 1c7b845ce3e2e7c8b3384d9ed4517f70e50def4f /usr.bin | |
| parent | a7fd2478129dda08354ff765dc74b02bb1e5d5e6 (diff) | |
allow ed25519 keys to appear as certificate authorities
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/key.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/key.c b/usr.bin/ssh/key.c index c5732709033..18393aacdbf 100644 --- a/usr.bin/ssh/key.c +++ b/usr.bin/ssh/key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: key.c,v 1.110 2013/12/07 00:19:15 djm Exp $ */ +/* $OpenBSD: key.c,v 1.111 2013/12/29 02:28:10 djm Exp $ */ /* * read_bignum(): * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1433,7 +1433,8 @@ cert_parse(Buffer *b, Key *key, const u_char *blob, u_int blen) } if (key->cert->signature_key->type != KEY_RSA && key->cert->signature_key->type != KEY_DSA && - key->cert->signature_key->type != KEY_ECDSA) { + key->cert->signature_key->type != KEY_ECDSA && + key->cert->signature_key->type != KEY_ED25519) { error("%s: Invalid signature key type %s (%d)", __func__, key_type(key->cert->signature_key), key->cert->signature_key->type); |