diff options
author | David Howells <dhowells@redhat.com> | 2012-10-02 19:30:19 +0100 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2012-10-02 19:30:19 +0100 |
commit | 4442d7704c7311d1c42383d365e0b883e0075975 (patch) | |
tree | ee80c095ea8b13c2ad62c9406ddc6166c5b09cb4 /security/keys/request_key_auth.c | |
parent | f8aa23a55f813c9bddec2a6176e0e67274e6e7c1 (diff) | |
parent | d4f65b5d2497b2fd9c45f06b71deb4ab084a5b66 (diff) | |
download | op-kernel-dev-4442d7704c7311d1c42383d365e0b883e0075975.zip op-kernel-dev-4442d7704c7311d1c42383d365e0b883e0075975.tar.gz |
Merge branch 'modsign-keys-devel' into security-next-keys
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'security/keys/request_key_auth.c')
-rw-r--r-- | security/keys/request_key_auth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c index 60d4e3f..85730d5 100644 --- a/security/keys/request_key_auth.c +++ b/security/keys/request_key_auth.c @@ -19,7 +19,8 @@ #include <asm/uaccess.h> #include "internal.h" -static int request_key_auth_instantiate(struct key *, const void *, size_t); +static int request_key_auth_instantiate(struct key *, + struct key_preparsed_payload *); static void request_key_auth_describe(const struct key *, struct seq_file *); static void request_key_auth_revoke(struct key *); static void request_key_auth_destroy(struct key *); @@ -42,10 +43,9 @@ struct key_type key_type_request_key_auth = { * Instantiate a request-key authorisation key. */ static int request_key_auth_instantiate(struct key *key, - const void *data, - size_t datalen) + struct key_preparsed_payload *prep) { - key->payload.data = (struct request_key_auth *) data; + key->payload.data = (struct request_key_auth *)prep->data; return 0; } |