Commit e4c4b0e4 authored Nov 14, 2018 by Linus Torvalds

Merge branch 'fixes-v4.20-rc3' of...

Merge branch 'fixes-v4.20-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull integrity fix from James Morris:
 "Fix a bug introduced with in this merge window in 82f94f24 ("KEYS:
  Provide software public key query function [ver #2]")"

* 'fixes-v4.20-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  integrity: support new struct public_key_signature encoding field

parents 3472f660 fd35f192

security/integrity/digsig_asymmetric.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@ int asymmetric_verify(struct key keyring, const char sig,

		pks.pkey_algo = "rsa";
		pks.hash_algo = hash_algo_name[hdr->hash_algo];
		pks.encoding = "pkcs1";
		pks.digest = (u8 *)data;
		pks.digest_size = datalen;
		pks.s = hdr->sig;