diff options
| author | David Howells <dhowells@redhat.com> | 2012-10-02 20:30:19 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-10-02 20:30:19 +0200 |
| commit | 4442d7704c7311d1c42383d365e0b883e0075975 (patch) | |
| tree | ee80c095ea8b13c2ad62c9406ddc6166c5b09cb4 /security/keys/keyring.c | |
| parent | KEYS: Use keyring_alloc() to create special keyrings (diff) | |
| parent | KEYS: Add payload preparsing opportunity prior to key instantiate or update (diff) | |
| download | linux-4442d7704c7311d1c42383d365e0b883e0075975.tar.xz linux-4442d7704c7311d1c42383d365e0b883e0075975.zip | |
Merge branch 'modsign-keys-devel' into security-next-keys
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'security/keys/keyring.c')
| -rw-r--r-- | security/keys/keyring.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c index 8c25558da14e..9270ba054a1e 100644 --- a/security/keys/keyring.c +++ b/security/keys/keyring.c @@ -66,7 +66,7 @@ static inline unsigned keyring_hash(const char *desc) * operations. */ static int keyring_instantiate(struct key *keyring, - const void *data, size_t datalen); + struct key_preparsed_payload *prep); static int keyring_match(const struct key *keyring, const void *criterion); static void keyring_revoke(struct key *keyring); static void keyring_destroy(struct key *keyring); @@ -121,12 +121,12 @@ static void keyring_publish_name(struct key *keyring) * Returns 0 on success, -EINVAL if given any data. */ static int keyring_instantiate(struct key *keyring, - const void *data, size_t datalen) + struct key_preparsed_payload *prep) { int ret; ret = -EINVAL; - if (datalen == 0) { + if (prep->datalen == 0) { /* make the keyring available by name if it has one */ keyring_publish_name(keyring); ret = 0; |