Merge tag 'v6.7-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / crypto / asymmetric_keys / public_key.c

diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c
index 8eeab38a3d8ae2d76cd2c7077a743ed5beaaec2f..e5f22691febd599d9a1eeb3310c19c762e715cd8 100644 (file)
--- a/crypto/asymmetric_keys/public_key.c
+++ b/crypto/asymmetric_keys/public_key.c
@@ -81,14 +81,13 @@ software_key_determine_akcipher(const struct public_key *pkey,
                 * RSA signatures usually use EMSA-PKCS1-1_5 [RFC3447 sec 8.2].
                 */
                if (strcmp(encoding, "pkcs1") == 0) {
+                       *sig = op == kernel_pkey_sign ||
+                              op == kernel_pkey_verify;
                        if (!hash_algo) {
-                               *sig = false;
                                n = snprintf(alg_name, CRYPTO_MAX_ALG_NAME,
                                             "pkcs1pad(%s)",
                                             pkey->pkey_algo);
                        } else {
-                               *sig = op == kernel_pkey_sign ||
-                                      op == kernel_pkey_verify;
                                n = snprintf(alg_name, CRYPTO_MAX_ALG_NAME,
                                             "pkcs1pad(%s,%s)",
                                             pkey->pkey_algo, hash_algo);