• Anton Blanchard's avatar
    RxRPC: Fix v1 keys · f009918a
    Anton Blanchard authored
    commit 33941284 (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: default avatarAnton Blanchard <anton@samba.org>
    Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    f009918a
rxrpc-type.h 4.04 KB