fix up MD4 stuff - interface is better now

[ppp.git] / pppd / chap_ms.c

diff --git a/pppd/chap_ms.c b/pppd/chap_ms.c
index c46ca13f7022eb0f4d3871284286eaa9fd2a7de5..808f978264c10508fc3f5924b49947cc18a731d7 100644 (file)
--- a/pppd/chap_ms.c
+++ b/pppd/chap_ms.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: chap_ms.c,v 1.5 1997/11/27 06:08:10 paulus Exp $";
+static char rcsid[] = "$Id: chap_ms.c,v 1.6 1998/02/04 01:40:33 paulus Exp $";
 #endif
 
 #ifdef CHAPMS
@@ -253,7 +253,7 @@ ChapMS_NT(rchallenge, rchallenge_len, secret, secret_len, response)
 {
     int                        i;
     MD4_CTX            md4Context;
-    u_short            hash[MD4_SIGNATURE_SIZE/sizeof(u_short)];
+    u_char             hash[MD4_SIGNATURE_SIZE];
     u_char             unicodePassword[MAX_NT_PASSWORD * 2];
     static int         low_byte_first = -1;
 
@@ -266,16 +266,9 @@ ChapMS_NT(rchallenge, rchallenge_len, secret, secret_len, response)
     MD4Init(&md4Context);
     MD4Update(&md4Context, unicodePassword, secret_len * 2 * 8);       /* Unicode is 2 bytes/char, *8 for bit count */
 
-    MD4Final((u_char *) hash, &md4Context);    /* Tell MD4 we're done */
+    MD4Final(hash, &md4Context);       /* Tell MD4 we're done */
 
-    if (low_byte_first == -1)
-       low_byte_first = (htons((unsigned short int)1) != 1);
-    if (low_byte_first == 0) {
-       for (i = 0; i < MD4_SIGNATURE_SIZE; i += sizeof(u_short))
-               hash[i] = htons(hash[i]);
-    }
-
-    ChallengeResponse(rchallenge, (u_char *)hash, response->NTResp);
+    ChallengeResponse(rchallenge, hash, response->NTResp);
 }
 
 #ifdef MSLANMAN