Skip to content

Commit

Permalink
Merge branch 'fixes-v4.20-rc3' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…kernel/git/jmorris/linux-security

Pull integrity fix from James Morris:
 "Fix a bug introduced with in this merge window in 82f94f2 ("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
  • Loading branch information
torvalds committed Nov 14, 2018
2 parents 3472f66 + fd35f19 commit e4c4b0e
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions security/integrity/digsig_asymmetric.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e4c4b0e

Please sign in to comment.