aboutsummaryrefslogtreecommitdiffstats
path: root/net/unix/af_unix.c
diff options
context:
space:
mode:
authorAnton Blanchard <[email protected]>2011-02-28 03:27:53 +0000
committerDavid S. Miller <[email protected]>2011-03-03 06:18:53 +0000
commitf009918a1c1bbf8607b8aab3959876913a30193a (patch)
tree4d2417f7e1dcebd817393291310a00f5d90eab8c /net/unix/af_unix.c
parentAF_RXRPC: Handle receiving ACKALL packets (diff)
downloadkernel-f009918a1c1bbf8607b8aab3959876913a30193a.tar.gz
kernel-f009918a1c1bbf8607b8aab3959876913a30193a.zip
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 <[email protected]> Signed-off-by: David Howells <[email protected]> Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions