diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2018-03-24 19:28:43 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2018-03-25 09:47:30 +1100 |
| commit | 9efcaaac314c611c6c0326e8bac5b486c424bbd2 (patch) | |
| tree | e6c467526fd04a6bf81c61f06f5d872e9d311ea5 | |
| parent | 393436024d2e4b4c7a01f9cfa5854e7437896d11 (diff) | |
upstream: fix bogus warning when signing cert keys using agent;
from djm; ok deraadt dtucker
OpenBSD-Commit-ID: 12e50836ba2040042383a8b71e12d7ea06e9633d
| -rw-r--r-- | sshconnect2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 2f0a57fa..1f4a74cf 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.269 2018/03/03 03:01:50 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.270 2018/03/24 19:28:43 markus Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -1014,6 +1014,8 @@ check_sigtype(const struct sshkey *key, const u_char *sig, size_t len) char *sigtype = NULL; const char *alg = key_sign_encode(key); + if (sshkey_is_cert(key)) + return 0; if ((r = sshkey_sigtype(sig, len, &sigtype)) != 0) return r; if (strcmp(sigtype, alg) != 0) { |