[openssh-commits] [openssh] 01/02: upstream: fix bogus warning when signing cert keys using agent;

git+noreply at mindrot.org git+noreply at mindrot.org
Sun Mar 25 09:49:13 AEDT 2018


This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 9efcaaac314c611c6c0326e8bac5b486c424bbd2
Author: markus at openbsd.org <markus at openbsd.org>
Date:   Sat Mar 24 19:28:43 2018 +0000

    upstream: fix bogus warning when signing cert keys using agent;
    
    from djm; ok deraadt dtucker
    
    OpenBSD-Commit-ID: 12e50836ba2040042383a8b71e12d7ea06e9633d
---
 sshconnect2.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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) {

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list