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

e4c4b0e4 · Linus Torvalds <[email protected]> · 2018-11-14 17:03:24 -06:00

Pull integrity fix from James Morris:
 "Fix a bug introduced with in this merge window in 82f94f24475c ("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

Commit: e4c4b0e45dfd1212831ad5bd129c6781d55e162a
Parents: 3472f660 · fd35f192

Merge commit. Changes below are compared with the first parent: 3472f660.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
security/integrity/digsig_asymmetric.c	modified	+1	−0	View file

security/integrity/digsig_asymmetric.c

View file

diff --git a/security/integrity/digsig_asymmetric.c b/security/integrity/digsig_asymmetric.c
index 6dc0751..d775e03 100644
--- a/security/integrity/digsig_asymmetric.c
+++ b/security/integrity/digsig_asymmetric.c
@@ -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;