r3462: separate out the crypto includes

(This used to be commit 3f75117db921e493bb77a5dc14b8ce91a6288f30)

6 files changed, 8 insertions, 69 deletions

diff --git a/source4/include/hmacmd5.h b/source4/include/hmacmd5.h
deleted file mode 100644
index aea4da30f8..0000000000
--- a/source4/include/hmacmd5.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Interface header: Scheduler service
-   Copyright (C) Luke Kenneth Casson Leighton 1996-1999
-   Copyright (C) Andrew Tridgell 1992-1999
-   
-   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.
-*/
-
-#ifndef _HMAC_MD5_H
-
-typedef struct 
-{
-        struct MD5Context ctx;
-        uint8_t k_ipad[65];    
-        uint8_t k_opad[65];
-
-} HMACMD5Context;
-
-#endif /* _HMAC_MD5_H */
diff --git a/source4/include/includes.h b/source4/include/includes.h
index cda7f976c3..58f8e80803 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -216,14 +216,9 @@ extern int errno;
 #include "lib/socket/socket.h"
 #include "libcli/ldap/ldap.h"
 #include "nameserv.h"
-#include "secrets.h"
 
 #include "byteorder.h"
 
-#include "md5.h"
-#include "hmacmd5.h"
-
-
 #include "module.h"
 
 #include "asn_1.h"
diff --git a/source4/include/md5.h b/source4/include/md5.h
deleted file mode 100644
index cd23979f8a..0000000000
--- a/source4/include/md5.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef MD5_H
-#define MD5_H
-#ifndef HEADER_MD5_H
-/* Try to avoid clashes with OpenSSL */
-#define HEADER_MD5_H 
-#endif
-
-struct MD5Context {
-	uint32_t buf[4];
-	uint32_t bits[2];
-	uint8_t in[64];
-};
-
-void MD5Init(struct MD5Context *context);
-void MD5Update(struct MD5Context *context, uint8_t const *buf,
-	       uint_t len);
-void MD5Final(uint8_t digest[16], struct MD5Context *context);
-
-/*
- * This is needed to make RSAREF happy on some MS-DOS compilers.
- */
-typedef struct MD5Context MD5_CTX;
-
-#endif /* !MD5_H */
diff --git a/source4/include/nameserv.h b/source4/include/nameserv.h
index 9efee46466..67eaf9dcc2 100644
--- a/source4/include/nameserv.h
+++ b/source4/include/nameserv.h
@@ -36,6 +36,13 @@
 #define MAX_DGRAM_SIZE (576) /* tcp/ip datagram limit is 576 bytes */
 #define MIN_DGRAM_SIZE 12
 
+/* A netbios name structure. */
+struct nmb_name {
+	char         name[17];
+	char         scope[64];
+	uint_t name_type;
+};
+
 /*********************************************************
  Types of reply packet.
 **********************************************************/
diff --git a/source4/include/rewrite.h b/source4/include/rewrite.h
index 8b5e00fdd2..432be56095 100644
--- a/source4/include/rewrite.h
+++ b/source4/include/rewrite.h
@@ -86,14 +86,6 @@ typedef int BOOL;
 
 #include "smb_macros.h"
 
-/* A netbios name structure. */
-struct nmb_name {
-	char         name[17];
-	char         scope[64];
-	uint_t name_type;
-};
-
-
 #include "rpc_secdes.h"
 
 #include "client.h"
diff --git a/source4/include/structs.h b/source4/include/structs.h
index 6bc19b1127..609f7df8fd 100644
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -62,5 +62,6 @@ struct ntlmssp_state;
 struct auth_methods;
 struct schannel_state;
 struct spnego_data;
+struct gensec_security;
 typedef NTSTATUS (*gensec_password_callback)(struct gensec_security *gensec_security, TALLOC_CTX *mem_ctx, 
 					     char **password);