summaryrefslogtreecommitdiff
path: root/key.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-12-29 17:48:38 +1100
committerDamien Miller <djm@mindrot.org>2013-12-29 17:48:38 +1100
commit83f2fe26cb19330712c952eddbd3c0b621674adc (patch)
treefafa05d14f2719bc9cd9324d1b9ed8ea7def25d0 /key.c
parent06122e9a74bb488b0fe0a8f64e1135de870f9cc0 (diff)
- 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.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/key.c b/key.c
index 814f9a001..ec40cb152 100644
--- a/key.c
+++ b/key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: key.c,v 1.110 2013/12/07 00:19:15 djm Exp $ */ 1/* $OpenBSD: key.c,v 1.111 2013/12/29 02:28:10 djm Exp $ */
2/* 2/*
3 * read_bignum(): 3 * read_bignum():
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * 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)
1481 } 1481 }
1482 if (key->cert->signature_key->type != KEY_RSA && 1482 if (key->cert->signature_key->type != KEY_RSA &&
1483 key->cert->signature_key->type != KEY_DSA && 1483 key->cert->signature_key->type != KEY_DSA &&
1484 key->cert->signature_key->type != KEY_ECDSA) { 1484 key->cert->signature_key->type != KEY_ECDSA &&
1485 key->cert->signature_key->type != KEY_ED25519) {
1485 error("%s: Invalid signature key type %s (%d)", __func__, 1486 error("%s: Invalid signature key type %s (%d)", __func__,
1486 key_type(key->cert->signature_key), 1487 key_type(key->cert->signature_key),
1487 key->cert->signature_key->type); 1488 key->cert->signature_key->type);