KEYS: Merge the type-specific data with the payload data

[deliverable/linux.git] / crypto / asymmetric_keys / public_key.c

diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c
index 81efccbe22d5b21d3e31e44f504fc23cefd32d76..6db4c01c6503ff267e0d7ecbe4dbf09496743c15 100644 (file)
--- 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);
 }