fix md5

Author: tanner0101

Sources/CMD5/md5.c renamed to Sources/CMD5/cmd5.c

@@ -35,11 +35,9 @@
  * compile-time configuration.
  */
 
-#ifndef HAVE_OPENSSL
-
 #include <string.h>
 
-#include "md5.h"
+#include "cmd5.h"
 
 /*
  * The basic MD5 functions.
@@ -79,16 +77,16 @@
  */
 #if defined(__i386__) || defined(__x86_64__) || defined(__vax__)
 #define SET(n) \
-(*(MD5_u32plus *)&ptr[(n) * 4])
+(*(CMD5_u32plus *)&ptr[(n) * 4])
 #define GET(n) \
 SET(n)
 #else
 #define SET(n) \
 (ctx->block[(n)] = \
-(MD5_u32plus)ptr[(n) * 4] | \
-((MD5_u32plus)ptr[(n) * 4 + 1] << 8) | \
-((MD5_u32plus)ptr[(n) * 4 + 2] << 16) | \
-((MD5_u32plus)ptr[(n) * 4 + 3] << 24))
+(CMD5_u32plus)ptr[(n) * 4] | \
+((CMD5_u32plus)ptr[(n) * 4 + 1] << 8) | \
+((CMD5_u32plus)ptr[(n) * 4 + 2] << 16) | \
+((CMD5_u32plus)ptr[(n) * 4 + 3] << 24))
 #define GET(n) \
 (ctx->block[(n)])
 #endif
@@ -97,11 +95,11 @@ SET(n)
  * This processes one or more 64-byte data blocks, but does NOT update the bit
  * counters.  There are no alignment requirements.
  */
-static const void *body(MD5_CTX *ctx, const void *data, unsigned long size)
+static const void *body(CMD5_CTX *ctx, const void *data, unsigned long size)
 {
     const unsigned char *ptr;
-    MD5_u32plus a, b, c, d;
-    MD5_u32plus saved_a, saved_b, saved_c, saved_d;
+    CMD5_u32plus a, b, c, d;
+    CMD5_u32plus saved_a, saved_b, saved_c, saved_d;
 
     ptr = (const unsigned char *)data;
 
@@ -204,7 +202,7 @@ static const void *body(MD5_CTX *ctx, const void *data, unsigned long size)
     return ptr;
 }
 
-void MD5_Init(MD5_CTX *ctx)
+void CMD5_Init(CMD5_CTX *ctx)
 {
     ctx->a = 0x67452301;
     ctx->b = 0xefcdab89;
@@ -215,9 +213,9 @@ void MD5_Init(MD5_CTX *ctx)
     ctx->hi = 0;
 }
 
-void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size)
+void CMD5_Update(CMD5_CTX *ctx, const void *data, unsigned long size)
 {
-    MD5_u32plus saved_lo;
+    CMD5_u32plus saved_lo;
     unsigned long used, available;
 
     saved_lo = ctx->lo;
@@ -255,7 +253,7 @@ void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size)
 (dst)[2] = (unsigned char)((src) >> 16); \
 (dst)[3] = (unsigned char)((src) >> 24);
 
-void MD5_Final(unsigned char *result, MD5_CTX *ctx)
+void CMD5_Final(unsigned char *result, CMD5_CTX *ctx)
 {
     unsigned long used, available;
 
@@ -287,5 +285,3 @@ void MD5_Final(unsigned char *result, MD5_CTX *ctx)
 
     memset(ctx, 0, sizeof(*ctx));
 }
-
-#endif

Sources/CMD5/include/md5.h renamed to Sources/CMD5/include/cmd5.h

@@ -22,24 +22,22 @@
  *
  * See md5.c for more information.
  */
- 
-#ifdef HAVE_OPENSSL
-#include <openssl/md5.h>
-#elif !defined(_MD5_H)
-#define _MD5_H
+
+#ifndef CMD5_H
+#define CMD5_H
 
 /* Any 32-bit or wider unsigned integer data type will do */
-typedef unsigned int MD5_u32plus;
+typedef unsigned int CMD5_u32plus;
 
 typedef struct {
-	MD5_u32plus lo, hi;
-	MD5_u32plus a, b, c, d;
+	CMD5_u32plus lo, hi;
+	CMD5_u32plus a, b, c, d;
 	unsigned char buffer[64];
-	MD5_u32plus block[16];
-} MD5_CTX;
- 
-extern void MD5_Init(MD5_CTX *ctx);
-extern void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size);
-extern void MD5_Final(unsigned char *result, MD5_CTX *ctx);
+	CMD5_u32plus block[16];
+} CMD5_CTX;
 
+extern void CMD5_Init(CMD5_CTX *ctx);
+extern void CMD5_Update(CMD5_CTX *ctx, const void *data, unsigned long size);
+extern void CMD5_Final(unsigned char *result, CMD5_CTX *ctx);
+
 #endif

Sources/PostgresNIO/Connection/PostgresConnection+Authenticate.swift

@@ -95,11 +95,11 @@ private final class PostgresAuthenticationRequest: PostgresRequest {
 
     private func md5(_ message: [UInt8]) -> [UInt8] {
         var message = message
-        var ctx = MD5_CTX()
-        MD5_Init(&ctx)
-        MD5_Update(&ctx, &message, numericCast(message.count))
+        var ctx = CMD5_CTX()
+        CMD5_Init(&ctx)
+        CMD5_Update(&ctx, &message, numericCast(message.count))
         var digest = [UInt8](repeating: 0, count: 16)
-        MD5_Final(&digest, &ctx)
+        CMD5_Final(&digest, &ctx)
         return digest
     }