1
0
Fork 0
alistair23-linux/include/keys
Anton Blanchard f009918a1c RxRPC: Fix v1 keys
commit 339412841d (RxRPC: Allow key payloads to be passed in XDR form)
broke klog for me. I notice the v1 key struct had a kif_version field
added:

-struct rxkad_key {
-       u16     security_index;         /* RxRPC header security index */
-       u16     ticket_len;             /* length of ticket[] */
-       u32     expiry;                 /* time at which expires */
-       u32     kvno;                   /* key version number */
-       u8      session_key[8];         /* DES session key */
-       u8      ticket[0];              /* the encrypted ticket */
-};

+struct rxrpc_key_data_v1 {
+       u32             kif_version;            /* 1 */
+       u16             security_index;
+       u16             ticket_length;
+       u32             expiry;                 /* time_t */
+       u32             kvno;
+       u8              session_key[8];
+       u8              ticket[0];
+};

However the code in rxrpc_instantiate strips it away:

	data += sizeof(kver);
	datalen -= sizeof(kver);

Removing kif_version fixes my problem.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-03-02 22:18:53 -08:00
..
dns_resolver-type.h DNS: Separate out CIFS DNS Resolver code 2010-08-05 17:17:51 +00:00
encrypted-type.h keys: add new key-type encrypted 2010-11-29 08:55:29 +11:00
keyring-type.h KEYS: Disperse linux/key_ui.h 2008-11-14 10:39:13 +11:00
rxrpc-type.h RxRPC: Fix v1 keys 2011-03-02 22:18:53 -08:00
trusted-type.h keys: add new trusted key-type 2010-11-29 08:55:25 +11:00
user-type.h [PATCH] keys: discard the contents of a key on revocation 2006-06-26 09:58:18 -07:00