diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-14 17:03:24 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-14 17:03:24 -0600 |
| commit | e4c4b0e45dfd1212831ad5bd129c6781d55e162a (patch) | |
| tree | 257381322eb2d6496e57e29cd02bc3cc3fa25e7a | |
| parent | 3472f66013d1972f0baf1631ea1e02479b902579 (diff) | |
| parent | fd35f192e42cf7c0df1e2480bfd5965e35b2f4ca (diff) | |
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 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
| -rw-r--r-- | security/integrity/digsig_asymmetric.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/integrity/digsig_asymmetric.c b/security/integrity/digsig_asymmetric.c index 6dc075144508..d775e03fbbcc 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; |