diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2014-07-09 14:35:13 +0100 |
---|---|---|
committer | Simo Sorce <simo@redhat.com> | 2014-08-07 12:44:46 -0400 |
commit | 9900ca295bb598eede3222a60ce5b9b1cf68166e (patch) | |
tree | e9d47012e1c69c8c61d1d82bdc43875f0c8f9ded | |
parent | 1f9635092ed65973b878e650ce34c2a425e396a4 (diff) | |
download | gss-ntlmssp-9900ca295bb598eede3222a60ce5b9b1cf68166e.tar.gz gss-ntlmssp-9900ca295bb598eede3222a60ce5b9b1cf68166e.tar.xz gss-ntlmssp-9900ca295bb598eede3222a60ce5b9b1cf68166e.zip |
Move all message structures to ntlm_common.h
struct wire_auth_msg was already there, we're about to want access to
struct wire_chal_msg, and we might as well keep them together.
-rw-r--r-- | src/ntlm.c | 22 | ||||
-rw-r--r-- | src/ntlm_common.h | 23 |
2 files changed, 23 insertions, 22 deletions
@@ -36,28 +36,6 @@ #include "ntlm.h" #pragma pack(push, 1) -struct wire_neg_msg { - struct wire_msg_hdr header; - uint32_t neg_flags; - struct wire_field_hdr domain_name; - struct wire_field_hdr workstation_name; - uint8_t payload[]; /* variable */ -}; -#pragma pack(pop) - -#pragma pack(push, 1) -struct wire_chal_msg { - struct wire_msg_hdr header; - struct wire_field_hdr target_name; - uint32_t neg_flags; - uint8_t server_challenge[8]; - uint8_t reserved[8]; - struct wire_field_hdr target_info; - uint8_t payload[]; /* variable */ -}; -#pragma pack(pop) - -#pragma pack(push, 1) struct wire_av_pair { uint16_t av_id; uint16_t av_len; diff --git a/src/ntlm_common.h b/src/ntlm_common.h index 1c62171..e3fe56e 100644 --- a/src/ntlm_common.h +++ b/src/ntlm_common.h @@ -77,6 +77,29 @@ struct wire_field_hdr { #pragma pack(pop) #pragma pack(push, 1) +struct wire_neg_msg { + struct wire_msg_hdr header; + uint32_t neg_flags; + struct wire_field_hdr domain_name; + struct wire_field_hdr workstation_name; + uint8_t payload[]; /* variable */ +}; +#pragma pack(pop) + +#pragma pack(push, 1) +struct wire_chal_msg { + struct wire_msg_hdr header; + struct wire_field_hdr target_name; + uint32_t neg_flags; + uint8_t server_challenge[8]; + uint8_t reserved[8]; + struct wire_field_hdr target_info; + uint8_t payload[]; /* variable */ +}; +#pragma pack(pop) + + +#pragma pack(push, 1) struct wire_auth_msg { struct wire_msg_hdr header; struct wire_field_hdr lm_chalresp; |