pppd.8: Document netmask option

[ppp.git] / pppd / chap-md5.c

diff --git a/pppd/chap-md5.c b/pppd/chap-md5.c
index 77dd4ecc705984bad999cb51fb6b8889f5b82f48..d9259d2515517b6eaec6a6637f7c2e8469578ed6 100644 (file)
--- a/pppd/chap-md5.c
+++ b/pppd/chap-md5.c
@@ -17,7 +17,7 @@
  * 3. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by Paul Mackerras
- *     <paulus@samba.org>".
+ *     <paulus@ozlabs.org>".
  *
  * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
  * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
@@ -30,15 +30,18 @@
 
 #define RCSID  "$Id: chap-md5.c,v 1.4 2004/11/09 22:39:25 paulus Exp $"
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
-#include "pppd.h"
-#include "chap-new.h"
+#include "pppd-private.h"
+#include "chap.h"
 #include "chap-md5.h"
 #include "magic.h"
-#include "md5.h"
+#include "crypto.h"
 
-#define MD5_HASH_SIZE          16
 #define MD5_MIN_CHALLENGE      16
 #define MD5_MAX_CHALLENGE      24
 
@@ -59,27 +62,43 @@ chap_md5_verify_response(int id, char *name,
                         unsigned char *challenge, unsigned char *response,
                         char *message, int message_space)
 {
-       MD5_CTX ctx;
        unsigned char idbyte = id;
-       unsigned char hash[MD5_HASH_SIZE];
+       unsigned char hash[MD5_DIGEST_LENGTH];
+       unsigned int  hash_len = MD5_DIGEST_LENGTH;
        int challenge_len, response_len;
+       bool success = 0;
 
        challenge_len = *challenge++;
        response_len = *response++;
-       if (response_len == MD5_HASH_SIZE) {
+       if (response_len == MD5_DIGEST_LENGTH) {
+
                /* Generate hash of ID, secret, challenge */
-               MD5_Init(&ctx);
-               MD5_Update(&ctx, &idbyte, 1);
-               MD5_Update(&ctx, secret, secret_len);
-               MD5_Update(&ctx, challenge, challenge_len);
-               MD5_Final(hash, &ctx);
-
-               /* Test if our hash matches the peer's response */
-               if (memcmp(hash, response, MD5_HASH_SIZE) == 0) {
-                       slprintf(message, message_space, "Access granted");
-                       return 1;
+               PPP_MD_CTX* ctx = PPP_MD_CTX_new();
+               if (ctx) {
+
+                       if (PPP_DigestInit(ctx, PPP_md5())) {
+
+                               if (PPP_DigestUpdate(ctx, &idbyte, 1)) {
+
+                                       if (PPP_DigestUpdate(ctx, secret, secret_len)) {
+
+                                               if (PPP_DigestUpdate(ctx, challenge, challenge_len)) {
+
+                                                       if (PPP_DigestFinal(ctx, hash, &hash_len)) {
+
+                                                               success = 1;
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+                       PPP_MD_CTX_free(ctx);
                }
        }
+       if (success && memcmp(hash, response, hash_len) == 0) {
+               slprintf(message, message_space, "Access granted");
+               return 1;
+       }
        slprintf(message, message_space, "Access denied");
        return 0;
 }
@@ -89,16 +108,31 @@ chap_md5_make_response(unsigned char *response, int id, char *our_name,
                       unsigned char *challenge, char *secret, int secret_len,
                       unsigned char *private)
 {
-       MD5_CTX ctx;
        unsigned char idbyte = id;
        int challenge_len = *challenge++;
+       int hash_len = MD5_DIGEST_LENGTH;
 
-       MD5_Init(&ctx);
-       MD5_Update(&ctx, &idbyte, 1);
-       MD5_Update(&ctx, (u_char *)secret, secret_len);
-       MD5_Update(&ctx, challenge, challenge_len);
-       MD5_Final(&response[1], &ctx);
-       response[0] = MD5_HASH_SIZE;
+       PPP_MD_CTX* ctx = PPP_MD_CTX_new();
+       if (ctx) {
+
+               if (PPP_DigestInit(ctx, PPP_md5())) {
+
+                       if (PPP_DigestUpdate(ctx, &idbyte, 1)) {
+
+                               if (PPP_DigestUpdate(ctx, secret, secret_len)) {
+
+                                       if (PPP_DigestUpdate(ctx, challenge, challenge_len)) {
+
+                                               if (PPP_DigestFinal(ctx, &response[1], &hash_len)) {
+
+                                                       response[0] = hash_len;
+                                               }
+                                       }
+                               }
+                       }
+               }
+               PPP_MD_CTX_free(ctx);
+       }
 }
 
 static struct chap_digest_type md5_digest = {