libtelnet: Standard type for strings.

libtelnet/auth-proto.h

@@ -81,8 +81,8 @@ void auth_finished (TN_Authenticator *, int);
 int auth_wait (char *, size_t);
 void auth_name (unsigned char *, int);
 void auth_disable_name (char *);
-void auth_printsub (unsigned char *, int, unsigned char *, int);
-int auth_sendname (unsigned char *, int);
+void auth_printsub (unsigned char *, int, char *, int);
+int auth_sendname (char *, int);
 
 # ifdef	KRB4
 int kerberos4_init (TN_Authenticator *, int);
@@ -90,7 +90,7 @@ int kerberos4_send (TN_Authenticator *);
 void kerberos4_is (TN_Authenticator *, unsigned char *, int);
 void kerberos4_reply (TN_Authenticator *, unsigned char *, int);
 int kerberos4_status (TN_Authenticator *, char *, size_t, int);
-void kerberos4_printsub (unsigned char *, int, unsigned char *, int);
+void kerberos4_printsub (unsigned char *, int, char *, int);
 # endif
 
 # ifdef	KRB5
@@ -99,7 +99,7 @@ int kerberos5_send (TN_Authenticator *);
 void kerberos5_is (TN_Authenticator *, unsigned char *, int);
 void kerberos5_reply (TN_Authenticator *, unsigned char *, int);
 int kerberos5_status (TN_Authenticator *, char *, size_t, int);
-void kerberos5_printsub (unsigned char *, int, unsigned char *, int);
+void kerberos5_printsub (unsigned char *, int, char *, int);
 # endif
 
 # ifdef	SHISHI
@@ -108,7 +108,7 @@ int krb5shishi_send (TN_Authenticator *);
 void krb5shishi_is (TN_Authenticator *, unsigned char *, int);
 void krb5shishi_reply (TN_Authenticator *, unsigned char *, int);
 int krb5shishi_status (TN_Authenticator *, char *, size_t, int);
-void krb5shishi_printsub (unsigned char *, int, unsigned char *, int);
+void krb5shishi_printsub (unsigned char *, int, char *, int);
 void krb5shishi_cleanup (TN_Authenticator *);
 # endif
 #endif

libtelnet/auth.c

@@ -629,12 +629,13 @@ auth_name (unsigned char *data, int cnt)
 }
 
 int
-auth_sendname (unsigned char *cp, int len)
+auth_sendname (char *name, int len)
 {
   static unsigned char str_request[256 + 6]
     = { IAC, SB, TELOPT_AUTHENTICATION, TELQUAL_NAME, };
   register unsigned char *e = str_request + 4;
   register unsigned char *ee = &str_request[sizeof (str_request) - 2];
+  unsigned char *cp = (unsigned char *) name;
 
   while (--len >= 0)
     {
@@ -708,11 +709,11 @@ auth_debug (int mode)
 }
 
 static void
-auth_gen_printsub (unsigned char *data, int cnt, unsigned char *buf,
+auth_gen_printsub (unsigned char *data, int cnt, char *buf,
 		   int buflen)
 {
-  register unsigned char *cp;
-  unsigned char tbuf[16];
+  register char *cp;
+  char tbuf[16];
 
   cnt -= 3;
   data += 3;
@@ -721,7 +722,7 @@ auth_gen_printsub (unsigned char *data, int cnt, unsigned char *buf,
   buflen -= 2;
   for (; cnt > 0; cnt--, data++)
     {
-      sprintf ((char *) tbuf, " %d", *data);
+      sprintf (tbuf, " %d", *data);
       for (cp = tbuf; *cp && buflen > 0; --buflen)
 	*buf++ = *cp++;
       if (buflen <= 0)
@@ -731,7 +732,7 @@ auth_gen_printsub (unsigned char *data, int cnt, unsigned char *buf,
 }
 
 void
-auth_printsub (unsigned char *data, int cnt, unsigned char *buf, int buflen)
+auth_printsub (unsigned char *data, int cnt, char *buf, int buflen)
 {
   TN_Authenticator *ap;
 

libtelnet/auth.h

@@ -96,7 +96,7 @@ typedef struct XauthP
   void (*is) (struct XauthP *, unsigned char *, int);
   void (*reply) (struct XauthP *, unsigned char *, int);
   int (*status) (struct XauthP *, char *, size_t, int);
-  void (*printsub) (unsigned char *, int, unsigned char *, int);
+  void (*printsub) (unsigned char *, int, char *, int);
   void (*cleanup) (struct XauthP *);
 } TN_Authenticator;
 

libtelnet/enc-proto.h

@@ -102,7 +102,7 @@ void encrypt_send_support (void);
 void encrypt_dec_keyid (unsigned char *, int);
 void encrypt_enc_keyid (unsigned char *, int);
 void encrypt_send_keyid (int, unsigned char *, int, int);
-void encrypt_printsub (unsigned char *, int, unsigned char *, int);
+void encrypt_printsub (unsigned char *, int, char *, int);
 int net_write (unsigned char *, int);
 
 # ifdef	TELNETD
@@ -119,7 +119,7 @@ int krbdes_reply (unsigned char *, int);
 void krbdes_init (int);
 int krbdes_start (int, int);
 void krbdes_session (Session_Key *, int);
-void krbdes_printsub (unsigned char *, int, unsigned char *, int);
+void krbdes_printsub (unsigned char *, int, char *, int);
 
 void cfb64_encrypt (unsigned char *, int);
 int cfb64_decrypt (int);
@@ -129,7 +129,7 @@ int cfb64_is (unsigned char *, int);
 int cfb64_reply (unsigned char *, int);
 void cfb64_session (Session_Key *, int);
 int cfb64_keyid (int, unsigned char *, int *);
-void cfb64_printsub (unsigned char *, int, unsigned char *, int);
+void cfb64_printsub (unsigned char *, int, char *, int);
 
 void ofb64_encrypt (unsigned char *, int);
 int ofb64_decrypt (int);
@@ -139,7 +139,7 @@ int ofb64_is (unsigned char *, int);
 int ofb64_reply (unsigned char *, int);
 void ofb64_session (Session_Key *, int);
 int ofb64_keyid (int, unsigned char *, int *);
-void ofb64_printsub (unsigned char *, int, unsigned char *, int);
+void ofb64_printsub (unsigned char *, int, char *, int);
 
 int des_new_random_key (Block);
 void des_set_random_generator_seed (Block);

libtelnet/enc_des.c

@@ -566,7 +566,7 @@ fb64_keyid (int dir, unsigned char *kp, int *lenp, struct fb *fbp)
 
 static void
 fb64_printsub (unsigned char *data, int cnt,
-	       unsigned char *buf, int buflen,
+	       char *buf, int buflen,
 	       const char *type)
 {
   char lbuf[32];
@@ -611,7 +611,7 @@ fb64_printsub (unsigned char *data, int cnt,
 
 void
 cfb64_printsub (unsigned char *data, int cnt,
-		unsigned char *buf, int buflen)
+		char *buf, int buflen)
 {
   fb64_printsub (data, cnt, buf, buflen, "CFB64");
 }
@@ -619,7 +619,7 @@ cfb64_printsub (unsigned char *data, int cnt,
 #   ifdef ENCTYPE_DES_OFB64
 void
 ofb64_printsub (unsigned char *data, int cnt,
-		unsigned char *buf, int buflen)
+		char *buf, int buflen)
 {
   fb64_printsub (data, cnt, buf, buflen, "OFB64");
 }

libtelnet/encrypt.c

@@ -988,7 +988,7 @@ encrypt_debug (int mode)
 
 static void
 encrypt_gen_printsub (unsigned char *data, int cnt,
-		      unsigned char *buf, int buflen)
+		      char *buf, int buflen)
 {
   char tbuf[16], *cp;
 
@@ -1010,7 +1010,7 @@ encrypt_gen_printsub (unsigned char *data, int cnt,
 
 void
 encrypt_printsub (unsigned char *data, int cnt,
-		  unsigned char *buf, int buflen)
+		  char *buf, int buflen)
 {
   Encryptions *ep;
   int type = data[1];

libtelnet/encrypt.h

@@ -142,7 +142,7 @@ typedef struct
   int (*reply) (unsigned char *, int);
   void (*session) (Session_Key *, int);
   int (*keyid) (int, unsigned char *, int *);
-  void (*printsub) (unsigned char *, int, unsigned char *, int);
+  void (*printsub) (unsigned char *, int, char *, int);
 } Encryptions;
 
 #  define SK_DES		1	/* Matched Kerberos v5 KEYTYPE_DES */

libtelnet/kerberos.c

@@ -498,7 +498,8 @@ kerberos4_status (ap, name, len, level)
 
 void
 kerberos4_printsub (data, cnt, buf, buflen)
-     unsigned char *data, *buf;
+     unsigned char *data;
+     char *buf;
      int cnt, buflen;
 {
   char lbuf[32];

libtelnet/kerberos5.c

@@ -745,7 +745,7 @@ req_type_str (int type)
 
 void
 kerberos5_printsub (unsigned char *data, int cnt,
-		    unsigned char *buf, int buflen)
+		    char *buf, int buflen)
 {
   char *p;
   int i;

libtelnet/shishi.c

@@ -683,7 +683,7 @@ req_type_str (int type)
 
 void
 krb5shishi_printsub (unsigned char *data, int cnt,
-		     unsigned char *buf, int buflen)
+		     char *buf, int buflen)
 {
   char *p;
   int i;