Add unit tests for NTLMv1 portable implementation

net/ntlm/md4.cc

Index: net/ntlm/md4.cc
diff --git a/net/http/md4.cc b/net/ntlm/md4.cc
similarity index 60%
rename from net/http/md4.cc
rename to net/ntlm/md4.cc
index 890b98b1d4f29c2c402787f15ebda5b94e9ecf94..9d91c6b6442c56a9bdbf60bad4de1aca4a19b95c 100644
--- a/net/http/md4.cc
+++ b/net/ntlm/md4.cc
@@ -45,7 +45,7 @@
  * "clean room" MD4 implementation (see RFC 1320)
  */
 
-#include "net/http/md4.h"
+#include "net/ntlm/md4.h"
 
 #include <string.h>
 
@@ -53,65 +53,66 @@ typedef uint32_t Uint32;
 typedef uint8_t Uint8;
 
 /* the "conditional" function */
-#define F(x,y,z) (((x) & (y)) | (~(x) & (z)))
+#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
 
 /* the "majority" function */
-#define G(x,y,z) (((x) & (y)) | ((x) & (z)) | ((y) & (z)))
+#define G(x, y, z) (((x) & (y)) | ((x) & (z)) | ((y) & (z)))
 
 /* the "parity" function */
-#define H(x,y,z) ((x) ^ (y) ^ (z))
+#define H(x, y, z) ((x) ^ (y) ^ (z))
 
 /* rotate n-bits to the left */
-#define ROTL(x,n) (((x) << (n)) | ((x) >> (0x20 - n)))
+#define ROTL(x, n) (((x) << (n)) | ((x) >> (0x20 - n)))
 
 /* round 1: [abcd k s]: a = (a + F(b,c,d) + X[k]) <<< s */
-#define RD1(a,b,c,d,k,s) a += F(b,c,d) + X[k]; a = ROTL(a,s)
+#define RD1(a, b, c, d, k, s) \
+  a += F(b, c, d) + X[k];     \
+  a = ROTL(a, s)
 
 /* round 2: [abcd k s]: a = (a + G(b,c,d) + X[k] + MAGIC) <<< s */
-#define RD2(a,b,c,d,k,s) a += G(b,c,d) + X[k] + 0x5A827999; a = ROTL(a,s)
+#define RD2(a, b, c, d, k, s)          \
+  a += G(b, c, d) + X[k] + 0x5A827999; \
+  a = ROTL(a, s)
 
 /* round 3: [abcd k s]: a = (a + H(b,c,d) + X[k] + MAGIC) <<< s */
-#define RD3(a,b,c,d,k,s) a += H(b,c,d) + X[k] + 0x6ED9EBA1; a = ROTL(a,s)
+#define RD3(a, b, c, d, k, s)          \
+  a += H(b, c, d) + X[k] + 0x6ED9EBA1; \
+  a = ROTL(a, s)
 
 /* converts from word array to byte array, len is number of bytes */
-static void w2b(Uint8 *out, const Uint32 *in, Uint32 len)
-{
-  Uint8 *bp; const Uint32 *wp, *wpend;
+static void w2b(Uint8* out, const Uint32* in, Uint32 len) {
+  Uint8* bp;
+  const Uint32 *wp, *wpend;
 
   bp = out;
   wp = in;
   wpend = wp + (len >> 2);
 
-  for (; wp != wpend; ++wp, bp += 4)
-  {
-    bp[0] = (Uint8) ((*wp      ) & 0xFF);
-    bp[1] = (Uint8) ((*wp >>  8) & 0xFF);
-    bp[2] = (Uint8) ((*wp >> 16) & 0xFF);
-    bp[3] = (Uint8) ((*wp >> 24) & 0xFF);
+  for (; wp != wpend; ++wp, bp += 4) {
+    bp[0] = (Uint8)((*wp) & 0xFF);
+    bp[1] = (Uint8)((*wp >> 8) & 0xFF);
+    bp[2] = (Uint8)((*wp >> 16) & 0xFF);
+    bp[3] = (Uint8)((*wp >> 24) & 0xFF);
   }
 }
 
 /* converts from byte array to word array, len is number of bytes */
-static void b2w(Uint32 *out, const Uint8 *in, Uint32 len)
-{
-  Uint32 *wp; const Uint8 *bp, *bpend;
+static void b2w(Uint32* out, const Uint8* in, Uint32 len) {
+  Uint32* wp;
+  const Uint8 *bp, *bpend;
 
   wp = out;
   bp = in;
   bpend = in + len;
 
-  for (; bp != bpend; bp += 4, ++wp)
-  {
-    *wp = (Uint32) (bp[0]      ) |
-          (Uint32) (bp[1] <<  8) |
-          (Uint32) (bp[2] << 16) |
-          (Uint32) (bp[3] << 24);
+  for (; bp != bpend; bp += 4, ++wp) {
+    *wp = (Uint32)(bp[0]) | (Uint32)(bp[1] << 8) | (Uint32)(bp[2] << 16) |
+          (Uint32)(bp[3] << 24);
   }
 }
 
 /* update state: data is 64 bytes in length */
-static void md4step(Uint32 state[4], const Uint8 *data)
-{
+static void md4step(Uint32 state[4], const Uint8* data) {
   Uint32 A, B, C, D, X[16];
 
   b2w(X, data, 64);
@@ -121,20 +122,56 @@ static void md4step(Uint32 state[4], const Uint8 *data)
   C = state[2];
   D = state[3];
 
-  RD1(A,B,C,D, 0,3); RD1(D,A,B,C, 1,7); RD1(C,D,A,B, 2,11); RD1(B,C,D,A, 3,19);
-  RD1(A,B,C,D, 4,3); RD1(D,A,B,C, 5,7); RD1(C,D,A,B, 6,11); RD1(B,C,D,A, 7,19);
-  RD1(A,B,C,D, 8,3); RD1(D,A,B,C, 9,7); RD1(C,D,A,B,10,11); RD1(B,C,D,A,11,19);
-  RD1(A,B,C,D,12,3); RD1(D,A,B,C,13,7); RD1(C,D,A,B,14,11); RD1(B,C,D,A,15,19);
-
-  RD2(A,B,C,D, 0,3); RD2(D,A,B,C, 4,5); RD2(C,D,A,B, 8, 9); RD2(B,C,D,A,12,13);
-  RD2(A,B,C,D, 1,3); RD2(D,A,B,C, 5,5); RD2(C,D,A,B, 9, 9); RD2(B,C,D,A,13,13);
-  RD2(A,B,C,D, 2,3); RD2(D,A,B,C, 6,5); RD2(C,D,A,B,10, 9); RD2(B,C,D,A,14,13);
-  RD2(A,B,C,D, 3,3); RD2(D,A,B,C, 7,5); RD2(C,D,A,B,11, 9); RD2(B,C,D,A,15,13);
-
-  RD3(A,B,C,D, 0,3); RD3(D,A,B,C, 8,9); RD3(C,D,A,B, 4,11); RD3(B,C,D,A,12,15);
-  RD3(A,B,C,D, 2,3); RD3(D,A,B,C,10,9); RD3(C,D,A,B, 6,11); RD3(B,C,D,A,14,15);
-  RD3(A,B,C,D, 1,3); RD3(D,A,B,C, 9,9); RD3(C,D,A,B, 5,11); RD3(B,C,D,A,13,15);
-  RD3(A,B,C,D, 3,3); RD3(D,A,B,C,11,9); RD3(C,D,A,B, 7,11); RD3(B,C,D,A,15,15);
+  RD1(A, B, C, D, 0, 3);
+  RD1(D, A, B, C, 1, 7);
+  RD1(C, D, A, B, 2, 11);
+  RD1(B, C, D, A, 3, 19);
+  RD1(A, B, C, D, 4, 3);
+  RD1(D, A, B, C, 5, 7);
+  RD1(C, D, A, B, 6, 11);
+  RD1(B, C, D, A, 7, 19);
+  RD1(A, B, C, D, 8, 3);
+  RD1(D, A, B, C, 9, 7);
+  RD1(C, D, A, B, 10, 11);
+  RD1(B, C, D, A, 11, 19);
+  RD1(A, B, C, D, 12, 3);
+  RD1(D, A, B, C, 13, 7);
+  RD1(C, D, A, B, 14, 11);
+  RD1(B, C, D, A, 15, 19);
+
+  RD2(A, B, C, D, 0, 3);
+  RD2(D, A, B, C, 4, 5);
+  RD2(C, D, A, B, 8, 9);
+  RD2(B, C, D, A, 12, 13);
+  RD2(A, B, C, D, 1, 3);
+  RD2(D, A, B, C, 5, 5);
+  RD2(C, D, A, B, 9, 9);
+  RD2(B, C, D, A, 13, 13);
+  RD2(A, B, C, D, 2, 3);
+  RD2(D, A, B, C, 6, 5);
+  RD2(C, D, A, B, 10, 9);
+  RD2(B, C, D, A, 14, 13);
+  RD2(A, B, C, D, 3, 3);
+  RD2(D, A, B, C, 7, 5);
+  RD2(C, D, A, B, 11, 9);
+  RD2(B, C, D, A, 15, 13);
+
+  RD3(A, B, C, D, 0, 3);
+  RD3(D, A, B, C, 8, 9);
+  RD3(C, D, A, B, 4, 11);
+  RD3(B, C, D, A, 12, 15);
+  RD3(A, B, C, D, 2, 3);
+  RD3(D, A, B, C, 10, 9);
+  RD3(C, D, A, B, 6, 11);
+  RD3(B, C, D, A, 14, 15);
+  RD3(A, B, C, D, 1, 3);
+  RD3(D, A, B, C, 9, 9);
+  RD3(C, D, A, B, 5, 11);
+  RD3(B, C, D, A, 13, 15);
+  RD3(A, B, C, D, 3, 3);
+  RD3(D, A, B, C, 11, 9);
+  RD3(C, D, A, B, 7, 11);
+  RD3(B, C, D, A, 15, 15);
 
   state[0] += A;
   state[1] += B;
@@ -145,8 +182,7 @@ static void md4step(Uint32 state[4], const Uint8 *data)
 namespace net {
 namespace weak_crypto {
 
-void MD4Sum(const Uint8 *input, Uint32 inputLen, Uint8 *result)
-{
+void MD4Sum(const Uint8* input, Uint32 inputLen, Uint8* result) {
   Uint8 final[128];
   Uint32 i, n, m, state[4];
 
@@ -160,7 +196,7 @@ void MD4Sum(const Uint8 *input, Uint32 inputLen, Uint8 *result)
   m = inputLen >> 6;
 
   /* digest first m segments */
-  for (i=0; i<m; ++i)
+  for (i = 0; i < m; ++i)
     md4step(state, (input + (i << 6)));
 
   /* build final buffer */