From ba2cfceb9647fd37a5dc010eb83cc87494dcdf2b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 22 Dec 2009 18:20:02 +1100 Subject: libcli/auth Make gd's NDR NTLMSSP parsers helpers common (but not built in Samba4 for now) --- source3/Makefile.in | 2 +- source3/libsmb/ntlmssp.c | 2 +- source3/libsmb/ntlmssp_ndr.c | 145 ------------------------------------------- source3/libsmb/ntlmssp_ndr.h | 44 ------------- 4 files changed, 2 insertions(+), 191 deletions(-) delete mode 100644 source3/libsmb/ntlmssp_ndr.c delete mode 100644 source3/libsmb/ntlmssp_ndr.h (limited to 'source3') diff --git a/source3/Makefile.in b/source3/Makefile.in index 59ffa24e27..ad1ce6ebc6 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -482,7 +482,7 @@ LIBSMB_OBJ0 = \ libsmb/ntlmssp.o \ libsmb/ntlmssp_sign.o \ $(LIBNDR_NTLMSSP_OBJ) \ - libsmb/ntlmssp_ndr.o + ../libcli/auth/ntlmssp_ndr.o LIBSAMBA_OBJ = $(LIBSMB_OBJ0) \ $(LIBSMB_ERR_OBJ) diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c index 60c1d49bb0..84cba43063 100644 --- a/source3/libsmb/ntlmssp.c +++ b/source3/libsmb/ntlmssp.c @@ -24,7 +24,7 @@ #include "includes.h" #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/ndr_ntlmssp.h" -#include "libsmb/ntlmssp_ndr.h" +#include "../libcli/auth/ntlmssp_ndr.h" static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state, DATA_BLOB reply, DATA_BLOB *next_request); diff --git a/source3/libsmb/ntlmssp_ndr.c b/source3/libsmb/ntlmssp_ndr.c deleted file mode 100644 index 92cd677572..0000000000 --- a/source3/libsmb/ntlmssp_ndr.c +++ /dev/null @@ -1,145 +0,0 @@ -/* - Unix SMB/Netbios implementation. - NTLMSSP ndr functions - - Copyright (C) Guenther Deschner 2009 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#include "includes.h" -#include "../librpc/gen_ndr/ndr_ntlmssp.h" -#include "libsmb/ntlmssp_ndr.h" - -#define NTLMSSP_PULL_MESSAGE(type, blob, mem_ctx, ic, r) \ -do { \ - enum ndr_err_code __ndr_err; \ - __ndr_err = ndr_pull_struct_blob(blob, mem_ctx, ic, r, \ - (ndr_pull_flags_fn_t)ndr_pull_ ##type); \ - if (!NDR_ERR_CODE_IS_SUCCESS(__ndr_err)) { \ - return ndr_map_error2ntstatus(__ndr_err); \ - } \ - if (memcmp(r->Signature, "NTLMSSP\0", 8)) {\ - return NT_STATUS_INVALID_PARAMETER; \ - } \ - return NT_STATUS_OK; \ -} while(0); - -#define NTLMSSP_PUSH_MESSAGE(type, blob, mem_ctx, ic, r) \ -do { \ - enum ndr_err_code __ndr_err; \ - __ndr_err = ndr_push_struct_blob(blob, mem_ctx, ic, r, \ - (ndr_push_flags_fn_t)ndr_push_ ##type); \ - if (!NDR_ERR_CODE_IS_SUCCESS(__ndr_err)) { \ - return ndr_map_error2ntstatus(__ndr_err); \ - } \ - return NT_STATUS_OK; \ -} while(0); - - -/** - * Pull NTLMSSP NEGOTIATE_MESSAGE struct from a blob - * @param blob The plain packet blob - * @param mem_ctx A talloc context - * @param ic Iconv convenience structure - * @param r Pointer to a NTLMSSP NEGOTIATE_MESSAGE structure - */ - -NTSTATUS ntlmssp_pull_NEGOTIATE_MESSAGE(const DATA_BLOB *blob, - TALLOC_CTX *mem_ctx, - struct smb_iconv_convenience *ic, - struct NEGOTIATE_MESSAGE *r) -{ - NTLMSSP_PULL_MESSAGE(NEGOTIATE_MESSAGE, blob, mem_ctx, ic, r); -} - -/** - * Pull NTLMSSP CHALLENGE_MESSAGE struct from a blob - * @param blob The plain packet blob - * @param mem_ctx A talloc context - * @param ic Iconv convenience structure - * @param r Pointer to a NTLMSSP CHALLENGE_MESSAGE structure - */ - -NTSTATUS ntlmssp_pull_CHALLENGE_MESSAGE(const DATA_BLOB *blob, - TALLOC_CTX *mem_ctx, - struct smb_iconv_convenience *ic, - struct CHALLENGE_MESSAGE *r) -{ - NTLMSSP_PULL_MESSAGE(CHALLENGE_MESSAGE, blob, mem_ctx, ic, r); -} - -/** - * Pull NTLMSSP AUTHENTICATE_MESSAGE struct from a blob - * @param blob The plain packet blob - * @param mem_ctx A talloc context - * @param ic Iconv convenience structure - * @param r Pointer to a NTLMSSP AUTHENTICATE_MESSAGE structure - */ - -NTSTATUS ntlmssp_pull_AUTHENTICATE_MESSAGE(const DATA_BLOB *blob, - TALLOC_CTX *mem_ctx, - struct smb_iconv_convenience *ic, - struct AUTHENTICATE_MESSAGE *r) -{ - NTLMSSP_PULL_MESSAGE(AUTHENTICATE_MESSAGE, blob, mem_ctx, ic, r); -} - -/** - * Push NTLMSSP NEGOTIATE_MESSAGE struct into a blob - * @param blob The plain packet blob - * @param mem_ctx A talloc context - * @param ic Iconv convenience structure - * @param r Pointer to a NTLMSSP NEGOTIATE_MESSAGE structure - */ - -NTSTATUS ntlmssp_push_NEGOTIATE_MESSAGE(DATA_BLOB *blob, - TALLOC_CTX *mem_ctx, - struct smb_iconv_convenience *ic, - const struct NEGOTIATE_MESSAGE *r) -{ - NTLMSSP_PUSH_MESSAGE(NEGOTIATE_MESSAGE, blob, mem_ctx, ic, r); -} - -/** - * Push NTLMSSP CHALLENGE_MESSAGE struct into a blob - * @param blob The plain packet blob - * @param mem_ctx A talloc context - * @param ic Iconv convenience structure - * @param r Pointer to a NTLMSSP CHALLENGE_MESSAGE structure - */ - -NTSTATUS ntlmssp_push_CHALLENGE_MESSAGE(DATA_BLOB *blob, - TALLOC_CTX *mem_ctx, - struct smb_iconv_convenience *ic, - const struct CHALLENGE_MESSAGE *r) -{ - NTLMSSP_PUSH_MESSAGE(CHALLENGE_MESSAGE, blob, mem_ctx, ic, r); -} - -/** - * Push NTLMSSP AUTHENTICATE_MESSAGE struct into a blob - * @param blob The plain packet blob - * @param mem_ctx A talloc context - * @param ic Iconv convenience structure - * @param r Pointer to a NTLMSSP AUTHENTICATE_MESSAGE structure - */ - -NTSTATUS ntlmssp_push_AUTHENTICATE_MESSAGE(DATA_BLOB *blob, - TALLOC_CTX *mem_ctx, - struct smb_iconv_convenience *ic, - const struct AUTHENTICATE_MESSAGE *r) -{ - NTLMSSP_PUSH_MESSAGE(AUTHENTICATE_MESSAGE, blob, mem_ctx, ic, r); -} diff --git a/source3/libsmb/ntlmssp_ndr.h b/source3/libsmb/ntlmssp_ndr.h deleted file mode 100644 index 52990b2a56..0000000000 --- a/source3/libsmb/ntlmssp_ndr.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - Unix SMB/Netbios implementation. - NTLMSSP ndr functions - - Copyright (C) Guenther Deschner 2009 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -NTSTATUS ntlmssp_pull_NEGOTIATE_MESSAGE(const DATA_BLOB *blob, - TALLOC_CTX *mem_ctx, - struct smb_iconv_convenience *ic, - struct NEGOTIATE_MESSAGE *r); -NTSTATUS ntlmssp_pull_CHALLENGE_MESSAGE(const DATA_BLOB *blob, - TALLOC_CTX *mem_ctx, - struct smb_iconv_convenience *ic, - struct CHALLENGE_MESSAGE *r); -NTSTATUS ntlmssp_pull_AUTHENTICATE_MESSAGE(const DATA_BLOB *blob, - TALLOC_CTX *mem_ctx, - struct smb_iconv_convenience *ic, - struct AUTHENTICATE_MESSAGE *r); -NTSTATUS ntlmssp_push_NEGOTIATE_MESSAGE(DATA_BLOB *blob, - TALLOC_CTX *mem_ctx, - struct smb_iconv_convenience *ic, - const struct NEGOTIATE_MESSAGE *r); -NTSTATUS ntlmssp_push_CHALLENGE_MESSAGE(DATA_BLOB *blob, - TALLOC_CTX *mem_ctx, - struct smb_iconv_convenience *ic, - const struct CHALLENGE_MESSAGE *r); -NTSTATUS ntlmssp_push_AUTHENTICATE_MESSAGE(DATA_BLOB *blob, - TALLOC_CTX *mem_ctx, - struct smb_iconv_convenience *ic, - const struct AUTHENTICATE_MESSAGE *r); -- cgit