summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2018-03-24 19:28:43 +0000
committerDarren Tucker <dtucker@dtucker.net>2018-03-25 09:47:30 +1100
commit9efcaaac314c611c6c0326e8bac5b486c424bbd2 (patch)
treee6c467526fd04a6bf81c61f06f5d872e9d311ea5 /sshconnect2.c
parent393436024d2e4b4c7a01f9cfa5854e7437896d11 (diff)
upstream: fix bogus warning when signing cert keys using agent;
from djm; ok deraadt dtucker OpenBSD-Commit-ID: 12e50836ba2040042383a8b71e12d7ea06e9633d
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index 2f0a57fac..1f4a74cf4 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect2.c,v 1.269 2018/03/03 03:01:50 djm Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.270 2018/03/24 19:28:43 markus Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Damien Miller. All rights reserved. 4 * 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)
1014 char *sigtype = NULL; 1014 char *sigtype = NULL;
1015 const char *alg = key_sign_encode(key); 1015 const char *alg = key_sign_encode(key);
1016 1016
1017 if (sshkey_is_cert(key))
1018 return 0;
1017 if ((r = sshkey_sigtype(sig, len, &sigtype)) != 0) 1019 if ((r = sshkey_sigtype(sig, len, &sigtype)) != 0)
1018 return r; 1020 return r;
1019 if (strcmp(sigtype, alg) != 0) { 1021 if (strcmp(sigtype, alg) != 0) {