diff options
| author | David Howells <dhowells@redhat.com> | 2016-04-06 17:13:33 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-04-06 17:13:33 +0200 |
| commit | 566a117a8b24e1ae2dfa817cf0c9eec092c783b5 (patch) | |
| tree | b2ebc4f27309656167ef03668f543d2494c994e7 /crypto/asymmetric_keys/pkcs7_trust.c | |
| parent | X.509: Retain the key verification data (diff) | |
| download | linux-566a117a8b24e1ae2dfa817cf0c9eec092c783b5.tar.xz linux-566a117a8b24e1ae2dfa817cf0c9eec092c783b5.zip | |
PKCS#7: Make the signature a pointer rather than embedding it
Point to the public_key_signature struct from the pkcs7_signed_info struct
rather than embedding it. This makes the code consistent with the X.509
signature handling and makes it possible to have a common cleanup function.
We also save a copy of the digest in the signature without sharing the
memory with the crypto layer metadata.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'crypto/asymmetric_keys/pkcs7_trust.c')
| -rw-r--r-- | crypto/asymmetric_keys/pkcs7_trust.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/asymmetric_keys/pkcs7_trust.c b/crypto/asymmetric_keys/pkcs7_trust.c index ed8128230dce..b9a5487cd82d 100644 --- a/crypto/asymmetric_keys/pkcs7_trust.c +++ b/crypto/asymmetric_keys/pkcs7_trust.c @@ -27,7 +27,7 @@ static int pkcs7_validate_trust_one(struct pkcs7_message *pkcs7, struct pkcs7_signed_info *sinfo, struct key *trust_keyring) { - struct public_key_signature *sig = &sinfo->sig; + struct public_key_signature *sig = sinfo->sig; struct x509_certificate *x509, *last = NULL, *p; struct key *key; bool trusted; @@ -105,7 +105,7 @@ static int pkcs7_validate_trust_one(struct pkcs7_message *pkcs7, * the signed info directly. */ key = x509_request_asymmetric_key(trust_keyring, - sinfo->signing_cert_id, + sinfo->sig->auth_ids[0], NULL, false); if (!IS_ERR(key)) { |