tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/12/29 02:28:10 

[key.c]
     allow ed25519 keys to appear as certificate authorities
This commit is contained in:
Damien Miller 2013-12-29 17:48:38 +11:00
parent 06122e9a74
commit 83f2fe26cb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -43,6 +43,9 @@
- djm@cvs.openbsd.org 2013/12/27 22:37:18 - djm@cvs.openbsd.org 2013/12/27 22:37:18
[ssh-rsa.c] [ssh-rsa.c]
correct comment correct comment
- djm@cvs.openbsd.org 2013/12/29 02:28:10
[key.c]
allow ed25519 keys to appear as certificate authorities
20131221 20131221
- (dtucker) [regress/keytype.sh] Actually test ecdsa key types. - (dtucker) [regress/keytype.sh] Actually test ecdsa key types.

5
key.c
View File

@ -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(): * read_bignum():
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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 && if (key->cert->signature_key->type != KEY_RSA &&
key->cert->signature_key->type != KEY_DSA && 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__, error("%s: Invalid signature key type %s (%d)", __func__,
key_type(key->cert->signature_key), key_type(key->cert->signature_key),
key->cert->signature_key->type); key->cert->signature_key->type);