Messages in this thread Patch in this message | | | Date | Tue, 15 Feb 2011 15:38:56 +1100 | From | Anton Blanchard <> | Subject | RxRPC: Fix v1 keys |
| |
commit 339412841d7 (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> ---
Index: linux-2.6/include/keys/rxrpc-type.h =================================================================== --- linux-2.6.orig/include/keys/rxrpc-type.h 2011-02-14 12:12:21.874546332 +1100 +++ linux-2.6/include/keys/rxrpc-type.h 2011-02-14 12:12:26.615010317 +1100 @@ -99,7 +99,6 @@ struct rxrpc_key_token { * structure of raw payloads passed to add_key() or instantiate key */ struct rxrpc_key_data_v1 { - u32 kif_version; /* 1 */ u16 security_index; u16 ticket_length; u32 expiry; /* time_t */
| |