diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-11-18 06:24:17 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-11-18 17:25:26 +1100 |
| commit | 85409cbb505d8c463ab6e2284b4039764c7243de (patch) | |
| tree | 4c2fc3838c7c918e180ab8c771337a2503835ad7 /ssh-keygen.c | |
| parent | e2e1283404e06a22ac6135d057199e70dcadb8dd (diff) | |
upstream: allow *-sk key types to be turned into certificates
OpenBSD-Commit-ID: cd365ee343934862286d0b011aa77fa739d2a945
Diffstat (limited to 'ssh-keygen.c')
| -rw-r--r-- | ssh-keygen.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index bf73d575..d95415fb 100644 --- a/ssh-keygen.c +++ b/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 @@ -1801,9 +1801,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)); |