Changeset 752 for trunk/server/lib/crypto

Timestamp:

Nov 29, 2012, 2:06:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9 2nd part

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/crypto/hmacmd5.c (modified) (2 diffs)
• lib/crypto/hmacmd5.h (modified) (1 diff)
• lib/crypto/md5.h (modified) (3 diffs)
• lib/crypto/md5test.c (modified) (1 diff)

trunk/server/lib/crypto/hmacmd5.c

@@ -37 +37 @@
         if (key_len > 64)
         {
-                struct MD5Context tctx;
+                MD5_CTX tctx;
 
                 MD5Init(&tctx);
@@ -92 +92 @@
 _PUBLIC_ void hmac_md5_final(uint8_t *digest, HMACMD5Context *ctx)
 {
-        struct MD5Context ctx_o;
+        MD5_CTX ctx_o;
 
         MD5Final(digest, &ctx->ctx);          

trunk/server/lib/crypto/hmacmd5.h

@@ -26 +26 @@
 typedef struct 
 {
-        struct MD5Context ctx;
+        MD5_CTX ctx;
         uint8_t k_ipad[65];    
         uint8_t k_opad[65];

trunk/server/lib/crypto/md5.h

@@ -6 +6 @@
 #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>
+#else
+
 struct MD5Context {
         uint32_t buf[4];
@@ -11 +20 @@
         uint8_t in[64];
 };
+typedef struct MD5Context MD5_CTX;
 
 void MD5Init(struct MD5Context *context);
@@ -17 +27 @@
 void MD5Final(uint8_t digest[16], struct MD5Context *context);
 
+#endif /* !HAVE_MD5_H */
+
 #endif /* !MD5_H */

trunk/server/lib/crypto/md5test.c

@@ -64 +64 @@
 
         for (i=0; i < ARRAY_SIZE(testarray); i++) {
-                struct MD5Context ctx;
+                MD5_CTX ctx;
                 uint8_t md5[16];
                 int e;