From: Eivind Næss <eivnaes@yahoo.com>
Date: Fri, 10 Mar 2023 00:20:03 +0000 (+0000)
Subject: Compiling with --enable-mslanman is broken
X-Git-Tag: ppp-2.5.0~6^2
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=ef95263d74a26edf08061b940db722189b441e9c;hp=11febba74597dc22b1f2611db14537e3e81a11bc;p=ppp.git

Compiling with --enable-mslanman is broken

Correcting the call to DesEncrypt() where needed.

Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
---

diff --git a/pppd/chap_ms.c b/pppd/chap_ms.c
index 6b2a026..e3d808f 100644
--- a/pppd/chap_ms.c
+++ b/pppd/chap_ms.c
@@ -654,11 +654,12 @@ ChapMS_LANMan(u_char *rchallenge, char *secret, int secret_len,
     BZERO(UcasePassword, sizeof(UcasePassword));
     for (i = 0; i < secret_len; i++)
        UcasePassword[i] = (u_char)toupper(secret[i]);
-    (void) DesSetkey(UcasePassword + 0);
-    DesEncrypt( StdText, PasswordHash + 0 );
-    (void) DesSetkey(UcasePassword + 7);
-    DesEncrypt( StdText, PasswordHash + 8 );
-    ChallengeResponse(rchallenge, PasswordHash, &response[MS_CHAP_LANMANRESP]);
+
+    if (DesEncrypt(StdText, UcasePassword + 0, PasswordHash + 0) &&
+        DesEncrypt(StdText, UcasePassword + 7, PasswordHash + 8)) {
+
+        ChallengeResponse(rchallenge, PasswordHash, &response[MS_CHAP_LANMANRESP]);
+    }
 }
 #endif