diff options
| author |   djm <djm@openbsd.org> | 2019-11-18 06:24:17 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2019-11-18 06:24:17 +0000 |
| commit | fdaabcac4651518cb6956d797375fc2294f98504 (patch) | |
| tree | c09d097c3acee4413b8841bd6c3101919105f513 /usr.bin/ssh/ssh-keygen.c | |
| parent | mention ed25519-sk key/cert types here too; prompted by jmc@ (diff) | |
| download | wireguard-openbsd-fdaabcac4651518cb6956d797375fc2294f98504.tar.xz wireguard-openbsd-fdaabcac4651518cb6956d797375fc2294f98504.zip | |
allow *-sk key types to be turned into certificates
Diffstat (limited to 'usr.bin/ssh/ssh-keygen.c')
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index 09fa566ae1d..1d87615d48d 100644 --- a/usr.bin/ssh/ssh-keygen.c +++ b/usr.bin/ssh/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.365 2019/11/18 01:59:48 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.366 2019/11/18 06:24:17 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1780,9 +1780,7 @@ do_ca_sign(struct passwd *pw, const char *ca_key_path, int prefer_agent, if ((r = sshkey_load_public(tmp, &public, &comment)) != 0) fatal("%s: unable to open \"%s\": %s", __func__, tmp, ssh_err(r)); - if (public->type != KEY_RSA && public->type != KEY_DSA && - public->type != KEY_ECDSA && public->type != KEY_ED25519 && - public->type != KEY_XMSS) + if (sshkey_is_cert(public)) fatal("%s: key \"%s\" type %s cannot be certified", __func__, tmp, sshkey_type(public)); |