Skip to content

L
linux
Commit 0c5ba019 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds
Browse files
Options

[PATCH] cifs: annotate SESSION_SETUP_ANX 

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 928e5846
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 138 deletions
fs/cifs/cifspdu.h
View file @ 0c5ba019
...@@ -436,15 +436,15 @@ typedef union smb_com_session_setup_andx { ...@@ -436,15 +436,15 @@ typedef union smb_com_session_setup_andx {
struct smb_hdr hdr; /* wct = 12 */ struct smb_hdr hdr; /* wct = 12 */
__u8 AndXCommand; __u8 AndXCommand;
__u8 AndXReserved; __u8 AndXReserved;
__u16 AndXOffset; __le16 AndXOffset;
__u16 MaxBufferSize; __le16 MaxBufferSize;
__u16 MaxMpxCount; __le16 MaxMpxCount;
__u16 VcNumber; __le16 VcNumber;
__u32 SessionKey; __u32 SessionKey;
__u16 SecurityBlobLength; __le16 SecurityBlobLength;
__u32 Reserved; __u32 Reserved;
__u32 Capabilities; /* see below */ __le32 Capabilities; /* see below */
__u16 ByteCount; __le16 ByteCount;
unsigned char SecurityBlob[1]; /* followed by */ unsigned char SecurityBlob[1]; /* followed by */
/* STRING NativeOS */ /* STRING NativeOS */
/* STRING NativeLanMan */ /* STRING NativeLanMan */
...@@ -454,16 +454,16 @@ typedef union smb_com_session_setup_andx { ...@@ -454,16 +454,16 @@ typedef union smb_com_session_setup_andx {
struct smb_hdr hdr; /* wct = 13 */ struct smb_hdr hdr; /* wct = 13 */
__u8 AndXCommand; __u8 AndXCommand;
__u8 AndXReserved; __u8 AndXReserved;
__u16 AndXOffset; __le16 AndXOffset;
__u16 MaxBufferSize; __le16 MaxBufferSize;
__u16 MaxMpxCount; __le16 MaxMpxCount;
__u16 VcNumber; __le16 VcNumber;
__u32 SessionKey; __u32 SessionKey;
__u16 CaseInsensitivePasswordLength; /* ASCII password length */ __le16 CaseInsensitivePasswordLength; /* ASCII password length */
__u16 CaseSensitivePasswordLength; /* Unicode password length */ __le16 CaseSensitivePasswordLength; /* Unicode password length */
__u32 Reserved; /* see below */ __u32 Reserved; /* see below */
__u32 Capabilities; __le32 Capabilities;
__u16 ByteCount; __le16 ByteCount;
unsigned char CaseInsensitivePassword[1]; /* followed by: */ unsigned char CaseInsensitivePassword[1]; /* followed by: */
/* unsigned char * CaseSensitivePassword; */ /* unsigned char * CaseSensitivePassword; */
/* STRING AccountName */ /* STRING AccountName */
...@@ -476,9 +476,9 @@ typedef union smb_com_session_setup_andx { ...@@ -476,9 +476,9 @@ typedef union smb_com_session_setup_andx {
struct smb_hdr hdr; /* wct = 4 */ struct smb_hdr hdr; /* wct = 4 */
__u8 AndXCommand; __u8 AndXCommand;
__u8 AndXReserved; __u8 AndXReserved;
__u16 AndXOffset; __le16 AndXOffset;
__u16 Action; /* see below */ __le16 Action; /* see below */
__u16 SecurityBlobLength; __le16 SecurityBlobLength;
__u16 ByteCount; __u16 ByteCount;
unsigned char SecurityBlob[1]; /* followed by */ unsigned char SecurityBlob[1]; /* followed by */
/* unsigned char * NativeOS; */ /* unsigned char * NativeOS; */
...@@ -490,14 +490,14 @@ typedef union smb_com_session_setup_andx { ...@@ -490,14 +490,14 @@ typedef union smb_com_session_setup_andx {
struct smb_hdr hdr; /* wct = 10 */ struct smb_hdr hdr; /* wct = 10 */
__u8 AndXCommand; __u8 AndXCommand;
__u8 AndXReserved; __u8 AndXReserved;
__u16 AndXOffset; __le16 AndXOffset;
__u16 MaxBufferSize; __le16 MaxBufferSize;
__u16 MaxMpxCount; __le16 MaxMpxCount;
__u16 VcNumber; __le16 VcNumber;
__u32 SessionKey; __u32 SessionKey;
__u16 PassswordLength; __le16 PassswordLength;
__u32 Reserved; __u32 Reserved;
__u16 ByteCount; __le16 ByteCount;
unsigned char AccountPassword[1]; /* followed by */ unsigned char AccountPassword[1]; /* followed by */
/* STRING AccountName */ /* STRING AccountName */
/* STRING PrimaryDomain */ /* STRING PrimaryDomain */
...@@ -509,8 +509,8 @@ typedef union smb_com_session_setup_andx { ...@@ -509,8 +509,8 @@ typedef union smb_com_session_setup_andx {
struct smb_hdr hdr; /* wct = 3 */ struct smb_hdr hdr; /* wct = 3 */
__u8 AndXCommand; __u8 AndXCommand;
__u8 AndXReserved; __u8 AndXReserved;
__u16 AndXOffset; __le16 AndXOffset;
__u16 Action; /* see below */ __le16 Action; /* see below */
__u16 ByteCount; __u16 ByteCount;
unsigned char NativeOS[1]; /* followed by */ unsigned char NativeOS[1]; /* followed by */
/* unsigned char * NativeLanMan; */ /* unsigned char * NativeLanMan; */
......
fs/cifs/connect.c
View file @ 0c5ba019
This diff is collapsed.
fs/cifs/ntlmssp.h
View file @ 0c5ba019
...@@ -60,15 +60,15 @@ ...@@ -60,15 +60,15 @@
/* appearance */ /* appearance */
typedef struct _SECURITY_BUFFER { typedef struct _SECURITY_BUFFER {
__u16 Length; __le16 Length;
__u16 MaximumLength; __le16 MaximumLength;
__u32 Buffer; /* offset to buffer */ __le32 Buffer; /* offset to buffer */
} SECURITY_BUFFER; } SECURITY_BUFFER;
typedef struct _NEGOTIATE_MESSAGE { typedef struct _NEGOTIATE_MESSAGE {
__u8 Signature[sizeof (NTLMSSP_SIGNATURE)]; __u8 Signature[sizeof (NTLMSSP_SIGNATURE)];
__u32 MessageType; /* 1 */ __le32 MessageType; /* 1 */
__u32 NegotiateFlags; __le32 NegotiateFlags;
SECURITY_BUFFER DomainName; /* RFC 1001 style and ASCII */ SECURITY_BUFFER DomainName; /* RFC 1001 style and ASCII */
SECURITY_BUFFER WorkstationName; /* RFC 1001 and ASCII */ SECURITY_BUFFER WorkstationName; /* RFC 1001 and ASCII */
char DomainString[0]; char DomainString[0];
...@@ -77,9 +77,9 @@ typedef struct _NEGOTIATE_MESSAGE { ...@@ -77,9 +77,9 @@ typedef struct _NEGOTIATE_MESSAGE {
typedef struct _CHALLENGE_MESSAGE { typedef struct _CHALLENGE_MESSAGE {
__u8 Signature[sizeof (NTLMSSP_SIGNATURE)]; __u8 Signature[sizeof (NTLMSSP_SIGNATURE)];
__u32 MessageType; /* 2 */ __le32 MessageType; /* 2 */
SECURITY_BUFFER TargetName; SECURITY_BUFFER TargetName;
__u32 NegotiateFlags; __le32 NegotiateFlags;
__u8 Challenge[CIFS_CRYPTO_KEY_SIZE]; __u8 Challenge[CIFS_CRYPTO_KEY_SIZE];
__u8 Reserved[8]; __u8 Reserved[8];
SECURITY_BUFFER TargetInfoArray; SECURITY_BUFFER TargetInfoArray;
...@@ -87,14 +87,14 @@ typedef struct _CHALLENGE_MESSAGE { ...@@ -87,14 +87,14 @@ typedef struct _CHALLENGE_MESSAGE {
typedef struct _AUTHENTICATE_MESSAGE { typedef struct _AUTHENTICATE_MESSAGE {
__u8 Signature[sizeof (NTLMSSP_SIGNATURE)]; __u8 Signature[sizeof (NTLMSSP_SIGNATURE)];
__u32 MessageType; /* 3 */ __le32 MessageType; /* 3 */
SECURITY_BUFFER LmChallengeResponse; SECURITY_BUFFER LmChallengeResponse;
SECURITY_BUFFER NtChallengeResponse; SECURITY_BUFFER NtChallengeResponse;
SECURITY_BUFFER DomainName; SECURITY_BUFFER DomainName;
SECURITY_BUFFER UserName; SECURITY_BUFFER UserName;
SECURITY_BUFFER WorkstationName; SECURITY_BUFFER WorkstationName;
SECURITY_BUFFER SessionKey; SECURITY_BUFFER SessionKey;
__u32 NegotiateFlags; __le32 NegotiateFlags;
char UserString[0]; char UserString[0];
} AUTHENTICATE_MESSAGE, *PAUTHENTICATE_MESSAGE; } AUTHENTICATE_MESSAGE, *PAUTHENTICATE_MESSAGE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7