Changeset 988 for vendor/current/lib/crypto/md5.h

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/lib/crypto/md5.h (modified) (2 diffs)

vendor/current/lib/crypto/md5.h

@@ -1 +1 @@
 #ifndef MD5_H
 #define MD5_H
+
 #ifndef HEADER_MD5_H
 /* Try to avoid clashes with OpenSSL */
@@ -6 +7 @@
 #endif
 
-#ifdef HAVE_MD5_H
-/*
- * Try to avoid clashes with Solaris MD5 implementation.
- * ...where almost all implementations follows:
- * "Schneier's Cryptography Classics Library"
- */
-#include <md5.h>
+#if defined(HAVE_BSD_MD5_H)
+/* Try to avoid clashes with BSD MD5 implementation (on linux) */
+#include <bsd/md5.h>
+
+#elif defined(HAVE_SYS_MD5_H)
+/* Try to avoid clashes with BSD MD5 implementation (on BSD) */
+#include <sys/md5.h>
+
+/* Try to use CommonCrypto on Mac as otherwise we can get MD5Final twice */
+#elif defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H)
+#include <CommonCrypto/CommonDigest.h>
+
+#define MD5_CTX                                 CC_MD5_CTX
+#define MD5Init(c)                                      CC_MD5_Init(c)
+#define MD5Update(c,d,l)                        CC_MD5_Update(c,d,l)
+#define MD5Final(m, c)                          CC_MD5_Final((unsigned char *)m,c)
+#define MD5Context CC_MD5state_st
+
 #else
-
-struct MD5Context {
+typedef struct MD5Context {
         uint32_t buf[4];
         uint32_t bits[2];
         uint8_t in[64];
-};
-typedef struct MD5Context MD5_CTX;
+} MD5_CTX;
 
-void MD5Init(struct MD5Context *context);
-void MD5Update(struct MD5Context *context, const uint8_t *buf,
+#define MD5_DIGEST_LENGTH 16
+
+void MD5Init(MD5_CTX *context);
+void MD5Update(MD5_CTX *context, const uint8_t *buf,
                size_t len);
-void MD5Final(uint8_t digest[16], struct MD5Context *context);
-
-#endif /* !HAVE_MD5_H */
+void MD5Final(uint8_t digest[MD5_DIGEST_LENGTH], MD5_CTX *context);
+#endif /* HAVE_*MD5_H */
 
 #endif /* !MD5_H */