Merge tag 'usb-5.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux-2.6-microblaze.git] / security / integrity / digsig_asymmetric.c

diff --git a/security/integrity/digsig_asymmetric.c b/security/integrity/digsig_asymmetric.c
index cfa4127..a662024 100644 (file)
--- a/security/integrity/digsig_asymmetric.c
+++ b/security/integrity/digsig_asymmetric.c
@@ -55,8 +55,14 @@ static struct key *request_asymmetric_key(struct key *keyring, uint32_t keyid)
        }
 
        if (IS_ERR(key)) {
-               pr_err_ratelimited("Request for unknown key '%s' err %ld\n",
-                                  name, PTR_ERR(key));
+               if (keyring)
+                       pr_err_ratelimited("Request for unknown key '%s' in '%s' keyring. err %ld\n",
+                                          name, keyring->description,
+                                          PTR_ERR(key));
+               else
+                       pr_err_ratelimited("Request for unknown key '%s' err %ld\n",
+                                          name, PTR_ERR(key));
+
                switch (PTR_ERR(key)) {
                        /* Hide some search errors */
                case -EACCES:
@@ -99,14 +105,22 @@ int asymmetric_verify(struct key *keyring, const char *sig,
        memset(&pks, 0, sizeof(pks));
 
        pks.hash_algo = hash_algo_name[hdr->hash_algo];
-       if (hdr->hash_algo == HASH_ALGO_STREEBOG_256 ||
-           hdr->hash_algo == HASH_ALGO_STREEBOG_512) {
+       switch (hdr->hash_algo) {
+       case HASH_ALGO_STREEBOG_256:
+       case HASH_ALGO_STREEBOG_512:
                /* EC-RDSA and Streebog should go together. */
                pks.pkey_algo = "ecrdsa";
                pks.encoding = "raw";
-       } else {
+               break;
+       case HASH_ALGO_SM3_256:
+               /* SM2 and SM3 should go together. */
+               pks.pkey_algo = "sm2";
+               pks.encoding = "raw";
+               break;
+       default:
                pks.pkey_algo = "rsa";
                pks.encoding = "pkcs1";
+               break;
        }
        pks.digest = (u8 *)data;
        pks.digest_size = datalen;