diff options
| author | Damien Miller <djm@mindrot.org> | 2013-12-29 17:48:38 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-12-29 17:48:38 +1100 |
| commit | 83f2fe26cb19330712c952eddbd3c0b621674adc (patch) | |
| tree | fafa05d14f2719bc9cd9324d1b9ed8ea7def25d0 /key.c | |
| parent | 06122e9a74bb488b0fe0a8f64e1135de870f9cc0 (diff) | |
| download | openssh-git-83f2fe26cb19330712c952eddbd3c0b621674adc.tar.gz | |
- djm@cvs.openbsd.org 2013/12/29 02:28:10
[key.c]
allow ed25519 keys to appear as certificate authorities
Diffstat (limited to 'key.c')
| -rw-r--r-- | key.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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 @@ -1481,7 +1481,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); |