TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'modsign-keys-devel' into security-next-keys

Browse Source 
Signed-off-by: David Howells <dhowells@redhat.com>
This commit is contained in:
David Howells
2012-10-02 19:30:19 +01:00
parent f8aa23a55f d4f65b5d24
commit 4442d7704c
15 changed files with 250 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/dns_resolver/dns_key.c
+3 -3
View File
@@ -59,13 +59,13 @@ const struct cred *dns_resolver_cache;
* "ip1,ip2,...#foo=bar"
*/
static int
dns_resolver_instantiate(struct key *key, const void *_data, size_t datalen)
dns_resolver_instantiate(struct key *key, struct key_preparsed_payload *prep)
{
struct user_key_payload *upayload;
unsigned long derrno;
int ret;
size_t result_len = 0;
const char *data = _data, *end, *opt;
size_t datalen = prep->datalen, result_len = 0;
const char *data = prep->data, *end, *opt;
kenter("%%%d,%s,'%*.*s',%zu",
key->serial, key->description,