r6294: - add obfuscate support, which is used in MAPI rpc's, (the ^= 0xA5 stuff),

  based on a patch from j.kerihuel@openchange.org

- remove unused $ndr_flags argument for the ParseCompression*Start() function's

metze
(This used to be commit 27ccdd61822ba1a24244086522b9f8fe97fe0a78)

2 files changed, 53 insertions, 0 deletions

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 770d2416d5..be4d536108 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -6,6 +6,7 @@ INIT_OBJ_FILES = \
 ADD_OBJ_FILES = \
 		librpc/ndr/ndr_basic.o \
 		librpc/ndr/ndr_compression.o \
+		librpc/ndr/ndr_obfuscate.o \
 		librpc/ndr/ndr_misc.o
 REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBCOMPRESSION
 # End SUBSYSTEM LIBNDR_RAW
diff --git a/source4/librpc/ndr/ndr_obfuscate.c b/source4/librpc/ndr/ndr_obfuscate.c
new file mode 100644
index 0000000000..4f875f19a7
--- /dev/null
+++ b/source4/librpc/ndr/ndr_obfuscate.c
@@ -0,0 +1,52 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   libndr obfuscate support (MAPI)
+
+   Copyright (C) Stefan Metzmacher 2005
+   
+   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 2 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, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+
+/*
+  handle obfuscated subcontext buffers, which in midl land are user-marshalled, but
+  we use magic in pidl to make them easier to cope with
+*/
+NTSTATUS ndr_pull_obfuscation(struct ndr_pull *ndr, uint8_t salt)
+{
+	uint32_t i;
+
+	for (i=0; i<ndr->data_size; i++) {
+		ndr->data[i] ^= salt;
+	}
+
+	return NT_STATUS_OK;
+}
+
+/*
+  push a obfuscated subcontext
+*/
+NTSTATUS ndr_push_obfuscation(struct ndr_push *ndr, uint8_t salt)
+{
+	uint32_t i;
+
+	for (i=0; i<ndr->offset; i++) {
+		ndr->data[i] ^= salt;
+	}
+
+	return NT_STATUS_OK;
+}