summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-24 15:34:30 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-24 15:34:30 +0200
commit45bc578664f4dae063672dde75bd442868a35992 (patch)
treed2fe0a20f0e21883fcf62333bb5079ebd2b808bd /source3/include
parent6925202bdee75d191bb5743659c53155ba1605ea (diff)
downloadsamba-45bc578664f4dae063672dde75bd442868a35992.tar.gz
samba-45bc578664f4dae063672dde75bd442868a35992.tar.bz2
samba-45bc578664f4dae063672dde75bd442868a35992.zip
Use common MD5.
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h2
-rw-r--r--source3/include/md5.h19
-rw-r--r--source3/include/proto.h6
3 files changed, 1 insertions, 26 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index fbf5ca6cd0..5543475488 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -686,7 +686,7 @@ typedef char fstring[FSTRING_LEN];
#include "authdata.h"
#include "msdfs.h"
#include "rap.h"
-#include "md5.h"
+#include "../lib/crypto/md5.h"
#include "hmacmd5.h"
#include "ntlmssp.h"
#include "auth.h"
diff --git a/source3/include/md5.h b/source3/include/md5.h
deleted file mode 100644
index e4cd08ed5e..0000000000
--- a/source3/include/md5.h
+++ /dev/null
@@ -1,19 +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 buf[4];
- uint32 bits[2];
- unsigned char in[64];
-};
-
-void MD5Init(struct MD5Context *context);
-void MD5Update(struct MD5Context *context, unsigned char const *buf,
- unsigned len);
-void MD5Final(unsigned char digest[16], struct MD5Context *context);
-
-#endif /* !MD5_H */
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4a51835f3d..d572a0c254 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -649,12 +649,6 @@ char *escape_rdn_val_string_alloc(const char *s);
void mdfour(unsigned char *out, const unsigned char *in, int n);
-/* The following definitions come from lib/md5.c */
-
-void MD5Init(struct MD5Context *ctx);
-void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len);
-void MD5Final(unsigned char digest[16], struct MD5Context *ctx);
-
/* The following definitions come from lib/module.c */
NTSTATUS smb_load_module(const char *module_name);