upstream: add a helper function to match a key type to a list of

signature algorithms. RSA keys can make signatures with multiple algorithms,
so some special handling is required. ok markus@

OpenBSD-Commit-ID: 03b41b2bda06fa4cd9c84cef6095033b9e49b6ff

diff --git a/sshkey.c b/sshkey.c
index 1cd5e8807d81e86eb267f9e5f57441cef1520632..f1e92003b7e40df63743b79924f9a18b5f8d6c66 100644 (file)
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.119 2021/07/23 03:37:52 djm Exp $ */
+/* $OpenBSD: sshkey.c,v 1.120 2022/01/06 22:05:42 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
@@ -255,6 +255,29 @@ sshkey_ecdsa_nid_from_name(const char *name)
        return -1;
 }
 
+int
+sshkey_match_keyname_to_sigalgs(const char *keyname, const char *sigalgs)
+{
+       int ktype;
+
+       if (sigalgs == NULL || *sigalgs == '\0' ||
+           (ktype = sshkey_type_from_name(keyname)) == KEY_UNSPEC)
+               return 0;
+       else if (ktype == KEY_RSA) {
+               return match_pattern_list("ssh-rsa", sigalgs, 0) == 1 ||
+                   match_pattern_list("rsa-sha2-256", sigalgs, 0) == 1 ||
+                   match_pattern_list("rsa-sha2-512", sigalgs, 0) == 1;
+       } else if (ktype == KEY_RSA_CERT) {
+               return match_pattern_list("ssh-rsa-cert-v01@openssh.com",
+                   sigalgs, 0) == 1 ||
+                   match_pattern_list("rsa-sha2-256-cert-v01@openssh.com",
+                   sigalgs, 0) == 1 ||
+                   match_pattern_list("rsa-sha2-512-cert-v01@openssh.com",
+                   sigalgs, 0) == 1;
+       } else
+               return match_pattern_list(keyname, sigalgs, 0) == 1;
+}
+
 char *
 sshkey_alg_list(int certs_only, int plain_only, int include_sigonly, char sep)
 {

diff --git a/sshkey.h b/sshkey.h
index 6edc6c5a5dbd30e36b98f4d55e004848d388ac43..094815e00a2a000f3ea538823913f8e8e14ab28a 100644 (file)
--- a/sshkey.h
+++ b/sshkey.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.h,v 1.50 2021/07/23 03:37:52 djm Exp $ */
+/* $OpenBSD: sshkey.h,v 1.51 2022/01/06 22:05:42 djm Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -192,6 +192,10 @@ int         sshkey_is_cert(const struct sshkey *);
 int     sshkey_is_sk(const struct sshkey *);
 int     sshkey_type_is_cert(int);
 int     sshkey_type_plain(int);
+
+/* Returns non-zero if key name match sigalgs pattern list. (handles RSA) */
+int     sshkey_match_keyname_to_sigalgs(const char *, const char *);
+
 int     sshkey_to_certified(struct sshkey *);
 int     sshkey_drop_cert(struct sshkey *);
 int     sshkey_cert_copy(const struct sshkey *, struct sshkey *);