Commit f1de9ace authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull crypto fix from Herbert Xu:
 "Fix a 6.5 regression in crypto/asymmetric_keys"

* tag 'v6.6-p5' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  KEYS: asymmetric: Fix sign/verify on pkcs1pad without a hash
parents 5722119f b1195035

crypto/asymmetric_keys/public_key.c

+2 −3
Original line number Diff line number Diff line
@@ -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);