diff options
author | Chris Zankel <chris@zankel.net> | 2016-01-21 05:16:13 +0000 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2016-01-21 05:16:13 +0000 |
commit | abc6a0eee5b5e3aaaf1d04260e3de3bc5d5c0937 (patch) | |
tree | e23eae0884d78fba55a41668cf809ae3ecd61159 /crypto/asymmetric_keys/public_key.c | |
parent | fbac254eaaaf03131033caa87420f9af2e273907 (diff) | |
parent | 874fbf3b2b51ca47c6a69a8e8ec5e8480c492478 (diff) | |
download | linux-crypto-abc6a0eee5b5e3aaaf1d04260e3de3bc5d5c0937.tar.gz linux-crypto-abc6a0eee5b5e3aaaf1d04260e3de3bc5d5c0937.zip |
Merge tag 'v4.4'
Linux 4.4
Diffstat (limited to 'crypto/asymmetric_keys/public_key.c')
-rw-r--r-- | crypto/asymmetric_keys/public_key.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c index 81efccbe..6db4c01c 100644 --- a/crypto/asymmetric_keys/public_key.c +++ b/crypto/asymmetric_keys/public_key.c @@ -49,7 +49,7 @@ EXPORT_SYMBOL_GPL(pkey_id_type_name); static void public_key_describe(const struct key *asymmetric_key, struct seq_file *m) { - struct public_key *key = asymmetric_key->payload.data; + struct public_key *key = asymmetric_key->payload.data[asym_crypto]; if (key) seq_printf(m, "%s.%s", @@ -112,7 +112,7 @@ EXPORT_SYMBOL_GPL(public_key_verify_signature); static int public_key_verify_signature_2(const struct key *key, const struct public_key_signature *sig) { - const struct public_key *pk = key->payload.data; + const struct public_key *pk = key->payload.data[asym_crypto]; return public_key_verify_signature(pk, sig); } |