diff options
| author |   James Morris <james.morris@microsoft.com> | 2018-12-17 11:24:28 -0800 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-12-17 11:24:28 -0800 |
| commit | 8bd8ea195f6d135a8d85201116314eb5237ad7e7 (patch) | |
| tree | 3ef99e468f0b4b13cc11002aa60c4451e326191b /security/integrity | |
| parent | security: fs: make inode explicitly non-modular (diff) | |
| parent | Linux 4.20-rc7 (diff) | |
| download | linux-dev-8bd8ea195f6d135a8d85201116314eb5237ad7e7.tar.xz linux-dev-8bd8ea195f6d135a8d85201116314eb5237ad7e7.zip | |
Merge tag 'v4.20-rc7' into next-general
Sync with Linux 4.20-rc7, to pick up: Revert "ovl: relax permission checking on underlying layers"
Diffstat (limited to 'security/integrity')
| -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; |