Misc. minor fixes.

6 files changed, 14 insertions, 12 deletions

diff --git a/cpukit/pppd/Makefile.am b/cpukit/pppd/Makefile.am
index 51c4ee59dc..7290998a20 100644
--- a/cpukit/pppd/Makefile.am
+++ b/cpukit/pppd/Makefile.am
@@ -19,8 +19,8 @@ endif
 
 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
-CLEANFILES = $(PREINSTALL_FILES)
-DISTCLEANFILES = $(PREINSTALL_DIRS)
+CLEANFILES =
+DISTCLEANFILES =
 
 include $(srcdir)/preinstall.am
 
diff --git a/cpukit/pppd/auth.c b/cpukit/pppd/auth.c
index a92654a650..b315a1f723 100644
--- a/cpukit/pppd/auth.c
+++ b/cpukit/pppd/auth.c
@@ -853,7 +853,7 @@ get_secret(unit, client, server, secret, secret_len, am_server)
     int unit;
     char *client;
     char *server;
-    char *secret;
+    unsigned char *secret;
     int *secret_len;
     int am_server;
 {
diff --git a/cpukit/pppd/chap.c b/cpukit/pppd/chap.c
index c1a17e5ab3..4f396c3681 100644
--- a/cpukit/pppd/chap.c
+++ b/cpukit/pppd/chap.c
@@ -403,7 +403,7 @@ ChapReceiveChallenge(cstate, inp, id, len)
     int rchallenge_len;
     u_char *rchallenge;
     int secret_len;
-    char secret[MAXSECRETLEN];
+    unsigned char secret[MAXSECRETLEN];
     char rhostname[256];
     MD5_CTX mdContext;
     u_char hash[MD5_SIGNATURE_SIZE];
@@ -498,7 +498,7 @@ ChapReceiveResponse(cstate, inp, id, len)
     int code;
     char rhostname[256];
     MD5_CTX mdContext;
-    char secret[MAXSECRETLEN];
+    unsigned char secret[MAXSECRETLEN];
     u_char hash[MD5_SIGNATURE_SIZE];
 
     if (cstate->serverstate == CHAPSS_CLOSED ||
diff --git a/cpukit/pppd/md5.c b/cpukit/pppd/md5.c
index 0c16b3e545..afabb6028e 100644
--- a/cpukit/pppd/md5.c
+++ b/cpukit/pppd/md5.c
@@ -122,7 +122,7 @@ MD5_CTX *mdContext;
  */
 void MD5Update (mdContext, inBuf, inLen)
 MD5_CTX *mdContext;
-unsigned char *inBuf;
+const unsigned char *inBuf;
 unsigned int inLen;
 {
   UINT4 in[16];
diff --git a/cpukit/pppd/md5.h b/cpukit/pppd/md5.h
index 7492b2228e..1756a31228 100644
--- a/cpukit/pppd/md5.h
+++ b/cpukit/pppd/md5.h
@@ -39,8 +39,10 @@
 
 #ifndef __MD5_INCLUDE__
 
+#include <stdint.h>
+
 /* typedef a 32-bit type */
-typedef unsigned int UINT4;
+typedef uint32_t UINT4;
 
 /* Data structure for MD5 (Message-Digest) computation */
 typedef struct {
@@ -50,9 +52,9 @@ typedef struct {
   unsigned char digest[16];     /* actual digest after MD5Final call */
 } MD5_CTX;
 
-void MD5Init ();
-void MD5Update ();
-void MD5Final ();
+void MD5Init (MD5_CTX *);
+void MD5Update (MD5_CTX *, const unsigned char *, unsigned int);
+void MD5Final (unsigned char [16], MD5_CTX *);
 
 #define __MD5_INCLUDE__
 #endif /* __MD5_INCLUDE__ */
diff --git a/cpukit/pppd/pppd.h b/cpukit/pppd/pppd.h
index ddc5571b23..95fe61531d 100644
--- a/cpukit/pppd/pppd.h
+++ b/cpukit/pppd/pppd.h
@@ -28,7 +28,7 @@
 #include <sys/types.h>		/* for u_int32_t, if defined */
 #include <sys/time.h>		/* for struct timeval */
 #include <net/ppp_defs.h>
-#include "rtemsdialer.h"
+#include <rtems/rtemsdialer.h>
 
 #if defined(__STDC__)
 #include <stdarg.h>
@@ -343,7 +343,7 @@ int  auth_check_options __P((void));
 void auth_reset __P((int));	/* check what secrets we have */
 int  check_passwd __P((int, char *, int, char *, int, char **));
 				/* Check peer-supplied username/password */
-int  get_secret __P((int, char *, char *, char *, int *, int));
+int  get_secret __P((int, char *, char *, unsigned char *, int *, int));
 				/* get "secret" for chap */
 int  auth_ip_addr __P((int, u_int32_t));
 				/* check if IP address is authorized */