Return target_info from ntlm_decode_auth_msg

The target_info structure embedded in the NT Response message in NTLMv2
contains information needed to establish if the client has sent a valid
MIC. So we need to extract and return it if the caller requested it.

Also moves some wire structures definitions in common to be able to
reuse them.

1 files changed, 0 insertions, 29 deletions

diff --git a/src/ntlm_crypto.c b/src/ntlm_crypto.c
index 5bccb39..f3701db 100644
--- a/src/ntlm_crypto.c
+++ b/src/ntlm_crypto.c
@@ -33,35 +33,6 @@
 #include "ntlm.h"
 #include "crypto.h"
 
-/* ntlm response, v1 or v2 */
-#pragma pack(push, 1)
-union wire_ntlm_response {
-    struct {
-        uint8_t resp[24];
-    } v1;
-    struct {
-        uint8_t resp[16];
-        uint8_t cli_chal[];
-    } v2;
-};
-#pragma pack(pop)
-
-#pragma pack(push, 1)
-struct wire_ntlmv2_cli_chal {
-    uint8_t resp_version;
-    uint8_t hi_resp_version;
-    uint8_t zero_6[6];
-    uint64_t timestamp;
-    uint8_t client_chal[8];
-    uint8_t zero_4[4];
-    uint8_t target_info[];
-        /* NOTE: the target_info array must terminate with 4 zero bytes.
-         * This is consistent with just copying the target_info array
-         * returned in the challenge message as the last AV_PAIR there is
-         * always MSV_AV_EOL which happens to be 4 bytes of zeros */
-};
-#pragma pack(pop)
-
 /* signature structure, v1 or v2 */
 #pragma pack(push, 1)
 union wire_msg_signature {