Danilo also says we can get rid of _MSDOS (Win16) tests, and explicit FAR/NEAR specs

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13786 dc483132-0cff-0310-8789-dd5450dbe970

24 files changed, 124 insertions, 99 deletions

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index 302eb3285..099cbd652 100644
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -6,7 +6,8 @@
 	keyed_cksum.c, make_checksum.c, make_random_key.c, old_api_glue.c,
 	prng.c, string_to_cksumtype.c, string_to_enctype.c,
 	string_to_key.c, valid_cksumtype.c, valid_enctype.c,
-	verify_checksum.c: Don't use KRB5_DLLIMP.
+	verify_checksum.c: Don't use KRB5_DLLIMP.  Don't explicitly
+	declare pointers FAR any more.
 
 2001-09-01  Ken Raeburn  <raeburn@mit.edu>
 
diff --git a/src/lib/crypto/cksumtype_to_string.c b/src/lib/crypto/cksumtype_to_string.c
index 5464fe300..8c75eaefb 100644
--- a/src/lib/crypto/cksumtype_to_string.c
+++ b/src/lib/crypto/cksumtype_to_string.c
@@ -30,7 +30,7 @@
 krb5_error_code KRB5_CALLCONV
 krb5_cksumtype_to_string(cksumtype, buffer, buflen)
     krb5_cksumtype	cksumtype;
-    char		FAR * buffer;
+    char		* buffer;
     size_t		buflen;
 {
     int i;
diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog
index 627241754..5379f0135 100644
--- a/src/lib/crypto/crc32/ChangeLog
+++ b/src/lib/crypto/crc32/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-03  Ken Raeburn  <raeburn@mit.edu>
+
+	* crc.c: Don't declare pointers FAR any more.
+
 2001-03-14  Ken Raeburn  <raeburn@mit.edu>
 
 	* crc-32.h: Stop using PROTOTYPE macro.
diff --git a/src/lib/crypto/crc32/crc.c b/src/lib/crypto/crc32/crc.c
index 4377f1c5b..9cefe0641 100644
--- a/src/lib/crypto/crc32/crc.c
+++ b/src/lib/crypto/crc32/crc.c
@@ -154,11 +154,11 @@ crc32_sum_func PROTOTYPE((
 	const size_t in_length,
 	const krb5_pointer seed,
 	const size_t seed_length,
-	krb5_checksum FAR *outcksum));
+	krb5_checksum *outcksum));
 
 static krb5_error_code
 crc32_verify_func PROTOTYPE((
-	const krb5_checksum FAR *cksum,
+	const krb5_checksum *cksum,
 	const krb5_pointer in,
 	const size_t in_length,
 	const krb5_pointer seed,
@@ -170,7 +170,7 @@ crc32_sum_func(in, in_length, seed, seed_length, outcksum)
     const size_t in_length;
     const krb5_pointer seed;
     const size_t seed_length;
-    krb5_checksum FAR *outcksum;
+    krb5_checksum *outcksum;
 {
     register u_char *data;
     register u_long c = 0;
@@ -199,7 +199,7 @@ crc32_sum_func(in, in_length, seed, seed_length, outcksum)
 
 static krb5_error_code
 crc32_verify_func(cksum, in, in_length, seed, seed_length)
-    const krb5_checksum FAR *cksum;
+    const krb5_checksum *cksum;
     const krb5_pointer in;
     const size_t in_length;
     const krb5_pointer seed;
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index af5eb3bca..6dc684759 100644
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-03  Ken Raeburn  <raeburn@mit.edu>
+
+	* afsstring2key.c, d3_cbc.c, des_int.h, f_cbc.c, f_cksum.c,
+	string2key.c: Don't explicitly declare pointers FAR any more.
+
 2001-06-22  Ken Raeburn  <raeburn@mit.edu>
 
 	* string2key.c (mit_des_string_to_key_int): Undo last change.
diff --git a/src/lib/crypto/des/afsstring2key.c b/src/lib/crypto/des/afsstring2key.c
index 73cb98af5..8773397f5 100644
--- a/src/lib/crypto/des/afsstring2key.c
+++ b/src/lib/crypto/des/afsstring2key.c
@@ -68,9 +68,9 @@ static char *afs_crypt (char*,char*,char*);
 
 krb5_error_code
 mit_afs_string_to_key (keyblock, data, salt)
-     krb5_keyblock FAR * keyblock;
-     const krb5_data FAR * data;
-     const krb5_data FAR * salt;
+     krb5_keyblock * keyblock;
+     const krb5_data * data;
+     const krb5_data * salt;
 {
   /* totally different approach from MIT string2key. */
   /* much of the work has already been done by the only caller 
diff --git a/src/lib/crypto/des/d3_cbc.c b/src/lib/crypto/des/d3_cbc.c
index ca5b075c2..22192cec8 100644
--- a/src/lib/crypto/des/d3_cbc.c
+++ b/src/lib/crypto/des/d3_cbc.c
@@ -29,8 +29,8 @@
 
 int
 mit_des3_cbc_encrypt(in, out, length, ks1, ks2, ks3, ivec, enc)
-	const mit_des_cblock FAR *in;
-	mit_des_cblock FAR *out;
+	const mit_des_cblock *in;
+	mit_des_cblock *out;
 	unsigned long length;
 	const mit_des_key_schedule ks1, ks2, ks3;
 	const mit_des_cblock ivec;
diff --git a/src/lib/crypto/des/des_int.h b/src/lib/crypto/des/des_int.h
index 422b3bda6..686cc3258 100644
--- a/src/lib/crypto/des/des_int.h
+++ b/src/lib/crypto/des/des_int.h
@@ -146,40 +146,40 @@ error(MIT_DES_KEYSIZE does not equal KRB5_MIT_DES_KEYSIZE)
 
 /* afsstring2key.c */
 extern krb5_error_code mit_afs_string_to_key
-	(krb5_keyblock FAR *keyblock,
-		   const krb5_data FAR *data,
-		   const krb5_data FAR *salt);
+	(krb5_keyblock *keyblock,
+		   const krb5_data *data,
+		   const krb5_data *salt);
 
 /* f_cksum.c */
 extern unsigned long mit_des_cbc_cksum
-    (const krb5_octet FAR *, krb5_octet FAR *, unsigned long ,
-     const mit_des_key_schedule, const krb5_octet FAR *);
+    (const krb5_octet *, krb5_octet *, unsigned long ,
+     const mit_des_key_schedule, const krb5_octet *);
 
 /* f_ecb.c */
 extern int mit_des_ecb_encrypt
-    (const mit_des_cblock FAR *, mit_des_cblock FAR *, mit_des_key_schedule , int );
+    (const mit_des_cblock *, mit_des_cblock *, mit_des_key_schedule , int );
 
 /* f_cbc.c */
-extern int mit_des_cbc_encrypt (const mit_des_cblock FAR *in,
-				mit_des_cblock FAR *out,
+extern int mit_des_cbc_encrypt (const mit_des_cblock *in,
+				mit_des_cblock *out,
 				unsigned long length,
 				const mit_des_key_schedule schedule,
 				const mit_des_cblock ivec, int enc);
     
 /* fin_rndkey.c */
 extern krb5_error_code mit_des_finish_random_key
-    ( const krb5_encrypt_block FAR *,
-		krb5_pointer FAR *);
+    ( const krb5_encrypt_block *,
+		krb5_pointer *);
 
 /* finish_key.c */
 extern krb5_error_code mit_des_finish_key
-    ( krb5_encrypt_block FAR *);
+    ( krb5_encrypt_block *);
 
 /* init_rkey.c */
 extern krb5_error_code mit_des_init_random_key
-    ( const krb5_encrypt_block FAR *,
-		const krb5_keyblock FAR *,
-		krb5_pointer FAR *);
+    ( const krb5_encrypt_block *,
+		const krb5_keyblock *,
+		krb5_pointer *);
 
 /* key_parity.c */
 extern void mit_des_fixup_key_parity (mit_des_cblock );
@@ -191,27 +191,27 @@ extern int mit_des_key_sched
 
 /* process_ky.c */
 extern krb5_error_code mit_des_process_key
-    ( krb5_encrypt_block FAR *,  const krb5_keyblock FAR *);
+    ( krb5_encrypt_block *,  const krb5_keyblock *);
 
 /* random_key.c */
 extern krb5_error_code mit_des_random_key
-    ( const krb5_encrypt_block FAR *, krb5_pointer ,
-                krb5_keyblock FAR * FAR *);
+    ( const krb5_encrypt_block *, krb5_pointer ,
+                krb5_keyblock **);
 
 /* string2key.c */
 extern krb5_error_code mit_des_string_to_key
-    ( const krb5_encrypt_block FAR *, 
-	       krb5_keyblock FAR *, const krb5_data FAR *, const krb5_data FAR *);
+    ( const krb5_encrypt_block *, 
+	       krb5_keyblock *, const krb5_data *, const krb5_data *);
 extern krb5_error_code mit_des_string_to_key_int
-	(krb5_keyblock FAR *, const krb5_data FAR *, const krb5_data FAR *);
+	(krb5_keyblock *, const krb5_data *, const krb5_data *);
 
 /* weak_key.c */
 extern int mit_des_is_weak_key (mit_des_cblock );
 
 /* cmb_keys.c */
 krb5_error_code mit_des_combine_subkeys
-    (const krb5_keyblock FAR *, const krb5_keyblock FAR *,
-	       krb5_keyblock FAR * FAR *);
+    (const krb5_keyblock *, const krb5_keyblock *,
+	       krb5_keyblock **);
 
 /* f_pcbc.c */
 int mit_des_pcbc_encrypt ();
@@ -222,7 +222,7 @@ int make_key_sched (mit_des_cblock, mit_des_key_schedule);
 
 
 /* misc.c */
-extern void swap_bits (char FAR *);
+extern void swap_bits (char *);
 extern unsigned long long_swap_bits (unsigned long );
 extern unsigned long swap_six_bits_to_ansi (unsigned long );
 extern unsigned long swap_four_bits_to_ansi (unsigned long );
@@ -239,8 +239,8 @@ extern void test_set (FILE *, const char *, int, const char *, int);
 
 /* d3_ecb.c */
 extern int mit_des3_ecb_encrypt
-	(const mit_des_cblock FAR *in,
-		   mit_des_cblock FAR *out,
+	(const mit_des_cblock *in,
+		   mit_des_cblock *out,
 		   mit_des_key_schedule sched1,
 		   mit_des_key_schedule sched2,
 		   mit_des_key_schedule sched3,
@@ -248,8 +248,8 @@ extern int mit_des3_ecb_encrypt
 
 /* d3_cbc.c */
 extern int mit_des3_cbc_encrypt
-	(const mit_des_cblock FAR *in,
-	 mit_des_cblock FAR *out,
+	(const mit_des_cblock *in,
+	 mit_des_cblock *out,
 	 unsigned long length,
 	 const mit_des_key_schedule ks1,
 	 const mit_des_key_schedule ks2,
@@ -269,10 +269,10 @@ extern int mit_des3_key_sched
 
 /* d3_str2ky.c */
 extern krb5_error_code mit_des3_string_to_key
-	(const krb5_encrypt_block FAR * eblock,
-		   krb5_keyblock FAR * keyblock,
-		   const krb5_data FAR * data,
-		   const krb5_data FAR * salt);
+	(const krb5_encrypt_block * eblock,
+		   krb5_keyblock * keyblock,
+		   const krb5_data * data,
+		   const krb5_data * salt);
 
 /* u_nfold.c */
 extern krb5_error_code mit_des_n_fold
diff --git a/src/lib/crypto/des/f_cbc.c b/src/lib/crypto/des/f_cbc.c
index e02d0bffa..87f64f4db 100644
--- a/src/lib/crypto/des/f_cbc.c
+++ b/src/lib/crypto/des/f_cbc.c
@@ -38,8 +38,8 @@
 
 int
 mit_des_cbc_encrypt(in, out, length, schedule, ivec, enc)
-	const mit_des_cblock FAR *in;
-	mit_des_cblock FAR *out;
+	const mit_des_cblock *in;
+	mit_des_cblock *out;
 	unsigned long length;
 	const mit_des_key_schedule schedule;
 	const mit_des_cblock ivec;
diff --git a/src/lib/crypto/des/f_cksum.c b/src/lib/crypto/des/f_cksum.c
index 0cfadc112..87b9c7f4b 100644
--- a/src/lib/crypto/des/f_cksum.c
+++ b/src/lib/crypto/des/f_cksum.c
@@ -30,11 +30,11 @@
 
 unsigned long
 mit_des_cbc_cksum(in, out, length, schedule, ivec)
-	const krb5_octet FAR *in;
-	krb5_octet FAR *out;
+	const krb5_octet *in;
+	krb5_octet *out;
 	unsigned long length;
 	const mit_des_key_schedule schedule;
-	const krb5_octet FAR *ivec;
+	const krb5_octet *ivec;
 {
 	register unsigned DES_INT32 left, right;
 	register unsigned DES_INT32 temp;
diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c
index 65f401410..a400f0701 100644
--- a/src/lib/crypto/des/string2key.c
+++ b/src/lib/crypto/des/string2key.c
@@ -71,9 +71,9 @@
 
 krb5_error_code
 mit_des_string_to_key_int (keyblock, data, salt)
-    krb5_keyblock FAR * keyblock;
-    const krb5_data FAR * data;
-    const krb5_data FAR * salt;
+    krb5_keyblock * keyblock;
+    const krb5_data * data;
+    const krb5_data * salt;
 {
     register krb5_octet *str, *copystr;
     register krb5_octet *key;
diff --git a/src/lib/crypto/enctype_to_string.c b/src/lib/crypto/enctype_to_string.c
index a79dc63b6..42b7d6081 100644
--- a/src/lib/crypto/enctype_to_string.c
+++ b/src/lib/crypto/enctype_to_string.c
@@ -30,7 +30,7 @@
 krb5_error_code KRB5_CALLCONV
 krb5_enctype_to_string(enctype, buffer, buflen)
     krb5_enctype	enctype;
-    char		FAR * buffer;
+    char		* buffer;
     size_t		buflen;
 {
     int i;
diff --git a/src/lib/crypto/keyed_checksum_types.c b/src/lib/crypto/keyed_checksum_types.c
index 06284b111..46b672cb0 100644
--- a/src/lib/crypto/keyed_checksum_types.c
+++ b/src/lib/crypto/keyed_checksum_types.c
@@ -86,7 +86,7 @@ krb5_c_keyed_checksum_types(context, enctype, count, cksumtypes)
 void KRB5_CALLCONV
 krb5_free_cksumtypes(context, val)
     krb5_context context;
-    krb5_cksumtype FAR * val;
+    krb5_cksumtype * val;
 {
     if (val)
 	krb5_xfree(val);
diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog
index 6cef77085..2117d72e1 100644
--- a/src/lib/crypto/md4/ChangeLog
+++ b/src/lib/crypto/md4/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-03  Ken Raeburn  <raeburn@mit.edu>
+
+	* md4.c, rsa-md4.h: Don't explicitly declare pointers FAR any
+	more.
+
 2001-03-14  Ken Raeburn  <raeburn@mit.edu>
 
 	* md4.c (GG, HH, krb5_MD4Init): Use UL suffix on numbers, don't
diff --git a/src/lib/crypto/md4/md4.c b/src/lib/crypto/md4/md4.c
index 4eb6a577c..36bcb65a9 100644
--- a/src/lib/crypto/md4/md4.c
+++ b/src/lib/crypto/md4/md4.c
@@ -39,7 +39,7 @@
 #include "rsa-md4.h"
 
 /* forward declaration */
-static void Transform (krb5_ui_4 FAR *, krb5_ui_4 FAR *);
+static void Transform (krb5_ui_4 *, krb5_ui_4 *);
 
 static const unsigned char PADDING[64] = {
   0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -77,7 +77,7 @@ static const unsigned char PADDING[64] = {
 
 void
 krb5_MD4Init (mdContext)
-krb5_MD4_CTX FAR *mdContext;
+krb5_MD4_CTX *mdContext;
 {
   mdContext->i[0] = mdContext->i[1] = (krb5_ui_4)0;
 
@@ -91,8 +91,8 @@ krb5_MD4_CTX FAR *mdContext;
 
 void
 krb5_MD4Update (mdContext, inBuf, inLen)
-krb5_MD4_CTX FAR *mdContext;
-const unsigned char FAR *inBuf;
+krb5_MD4_CTX *mdContext;
+const unsigned char *inBuf;
 unsigned int inLen;
 {
   krb5_ui_4 in[16];
@@ -127,7 +127,7 @@ unsigned int inLen;
 
 void
 krb5_MD4Final (mdContext)
-krb5_MD4_CTX FAR *mdContext;
+krb5_MD4_CTX *mdContext;
 {
   krb5_ui_4 in[16];
   int mdi;
@@ -169,8 +169,8 @@ krb5_MD4_CTX FAR *mdContext;
 /* Basic MD4 step. Transform buf based on in.
  */
 static void Transform (buf, in)
-krb5_ui_4 FAR *buf;
-krb5_ui_4 FAR *in;
+krb5_ui_4 *buf;
+krb5_ui_4 *in;
 {
   register krb5_ui_4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
 
diff --git a/src/lib/crypto/md4/rsa-md4.h b/src/lib/crypto/md4/rsa-md4.h
index 7141d0a96..3e58a9797 100644
--- a/src/lib/crypto/md4/rsa-md4.h
+++ b/src/lib/crypto/md4/rsa-md4.h
@@ -86,9 +86,9 @@ typedef struct {
   unsigned char digest[16];		/* actual digest after MD4Final call */
 } krb5_MD4_CTX;
 
-extern void krb5_MD4Init(krb5_MD4_CTX FAR *);
-extern void krb5_MD4Update(krb5_MD4_CTX FAR *, const unsigned char FAR *, unsigned int);
-extern void krb5_MD4Final(krb5_MD4_CTX FAR *);
+extern void krb5_MD4Init(krb5_MD4_CTX *);
+extern void krb5_MD4Update(krb5_MD4_CTX *, const unsigned char *, unsigned int);
+extern void krb5_MD4Final(krb5_MD4_CTX *);
 
 /*
  **********************************************************************
diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog
index 74834d125..47fe11338 100644
--- a/src/lib/crypto/md5/ChangeLog
+++ b/src/lib/crypto/md5/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-03  Ken Raeburn  <raeburn@mit.edu>
+
+	* md5.c, rsa-md5.h: Don't explicitly declare pointers FAR any
+	more.
+
 2001-06-12  Ezra Peisach  <epeisach@mit.edu>
 
 	* t_mddriver.c: Cleanup assignments in conditionals w/o parentheses.
diff --git a/src/lib/crypto/md5/md5.c b/src/lib/crypto/md5/md5.c
index b1fa96cad..98c48e494 100644
--- a/src/lib/crypto/md5/md5.c
+++ b/src/lib/crypto/md5/md5.c
@@ -50,7 +50,7 @@
  */
 
 /* forward declaration */
-static void Transform (krb5_ui_4 FAR *buf, krb5_ui_4 FAR *in);
+static void Transform (krb5_ui_4 *buf, krb5_ui_4 *in);
 
 static const unsigned char PADDING[64] = {
   0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -108,7 +108,7 @@ static const unsigned char PADDING[64] = {
  */
 void 
 krb5_MD5Init (mdContext)
-krb5_MD5_CTX FAR *mdContext;
+krb5_MD5_CTX *mdContext;
 {
   mdContext->i[0] = mdContext->i[1] = (krb5_ui_4)0;
 
@@ -126,8 +126,8 @@ krb5_MD5_CTX FAR *mdContext;
  */
 void
 krb5_MD5Update (mdContext, inBuf, inLen)
-krb5_MD5_CTX FAR *mdContext;
-const unsigned char FAR *inBuf;
+krb5_MD5_CTX *mdContext;
+const unsigned char *inBuf;
 unsigned int inLen;
 {
   krb5_ui_4 in[16];
@@ -165,7 +165,7 @@ unsigned int inLen;
  */
 void
 krb5_MD5Final (mdContext)
-krb5_MD5_CTX FAR *mdContext;
+krb5_MD5_CTX *mdContext;
 {
   krb5_ui_4 in[16];
   int mdi;
@@ -206,8 +206,8 @@ krb5_MD5_CTX FAR *mdContext;
 /* Basic MD5 step. Transforms buf based on in.
  */
 static void Transform (buf, in)
-krb5_ui_4 FAR *buf;
-krb5_ui_4 FAR *in;
+krb5_ui_4 *buf;
+krb5_ui_4 *in;
 {
   register krb5_ui_4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
 
diff --git a/src/lib/crypto/md5/rsa-md5.h b/src/lib/crypto/md5/rsa-md5.h
index 9cb53a6a7..654eae2d9 100644
--- a/src/lib/crypto/md5/rsa-md5.h
+++ b/src/lib/crypto/md5/rsa-md5.h
@@ -48,9 +48,9 @@ typedef struct {
   unsigned char digest[16];		/* actual digest after MD5Final call */
 } krb5_MD5_CTX;
 
-extern void krb5_MD5Init(krb5_MD5_CTX FAR *);
-extern void krb5_MD5Update(krb5_MD5_CTX FAR *,const unsigned char FAR *,unsigned int);
-extern void krb5_MD5Final(krb5_MD5_CTX FAR *);
+extern void krb5_MD5Init(krb5_MD5_CTX *);
+extern void krb5_MD5Update(krb5_MD5_CTX *,const unsigned char *,unsigned int);
+extern void krb5_MD5Final(krb5_MD5_CTX *);
 
 #define	RSA_MD5_CKSUM_LENGTH		16
 #define	OLD_RSA_MD5_DES_CKSUM_LENGTH	16
diff --git a/src/lib/crypto/old/ChangeLog b/src/lib/crypto/old/ChangeLog
index ed05469a2..19067e342 100644
--- a/src/lib/crypto/old/ChangeLog
+++ b/src/lib/crypto/old/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-03  Ken Raeburn  <raeburn@mit.edu>
+
+	* des_stringtokey.c: Don't explicitly declare pointers FAR any
+	more.
+
 2001-04-10  Ken Raeburn  <raeburn@mit.edu>
 
 	* old_decrypt.c (krb5_old_decrypt): Fix casts.
diff --git a/src/lib/crypto/old/des_stringtokey.c b/src/lib/crypto/old/des_stringtokey.c
index 3b4f627a4..55b0c0f44 100644
--- a/src/lib/crypto/old/des_stringtokey.c
+++ b/src/lib/crypto/old/des_stringtokey.c
@@ -30,9 +30,9 @@
 
 /* XXX */
 extern krb5_error_code mit_des_string_to_key_int
-KRB5_PROTOTYPE ((krb5_keyblock FAR * keyblock,
-		 const krb5_data FAR * data,
-		 const krb5_data FAR * salt));
+KRB5_PROTOTYPE ((krb5_keyblock * keyblock,
+		 const krb5_data * data,
+		 const krb5_data * salt));
 
 krb5_error_code
 krb5_des_string_to_key(enc, string, salt, key)
diff --git a/src/lib/crypto/old_api_glue.c b/src/lib/crypto/old_api_glue.c
index d78ab2423..b6847a6c5 100644
--- a/src/lib/crypto/old_api_glue.c
+++ b/src/lib/crypto/old_api_glue.c
@@ -32,7 +32,7 @@ krb5_encrypt(context, inptr, outptr, size, eblock, ivec)
      const krb5_pointer inptr;
      krb5_pointer outptr;
      const size_t size;
-     krb5_encrypt_block FAR * eblock;
+     krb5_encrypt_block * eblock;
      krb5_pointer ivec;
 {
     krb5_data inputd, ivecd;
@@ -71,7 +71,7 @@ krb5_decrypt(context, inptr, outptr, size, eblock, ivec)
      const krb5_pointer inptr;
      krb5_pointer outptr;
      const size_t size;
-     krb5_encrypt_block FAR * eblock;
+     krb5_encrypt_block * eblock;
      krb5_pointer ivec;
 {
     krb5_enc_data inputd;
@@ -105,8 +105,8 @@ krb5_decrypt(context, inptr, outptr, size, eblock, ivec)
 krb5_error_code KRB5_CALLCONV
 krb5_process_key(context, eblock, key)
      krb5_context context;
-     krb5_encrypt_block FAR * eblock;
-     const krb5_keyblock FAR * key;
+     krb5_encrypt_block * eblock;
+     const krb5_keyblock * key;
 {
     eblock->key = (krb5_keyblock *) key;
 
@@ -116,7 +116,7 @@ krb5_process_key(context, eblock, key)
 krb5_error_code KRB5_CALLCONV
 krb5_finish_key(context, eblock)
      krb5_context context;
-     krb5_encrypt_block FAR * eblock;
+     krb5_encrypt_block * eblock;
 {
     return(0);
 }
@@ -124,10 +124,10 @@ krb5_finish_key(context, eblock)
 krb5_error_code KRB5_CALLCONV
 krb5_string_to_key(context, eblock, keyblock, data, salt)
      krb5_context context;
-     const krb5_encrypt_block FAR * eblock;
-     krb5_keyblock FAR * keyblock;
-     const krb5_data FAR * data;
-     const krb5_data FAR * salt;
+     const krb5_encrypt_block * eblock;
+     krb5_keyblock * keyblock;
+     const krb5_data * data;
+     const krb5_data * salt;
 {
     return(krb5_c_string_to_key(context, eblock->crypto_entry, data, salt,
 				keyblock));
@@ -136,9 +136,9 @@ krb5_string_to_key(context, eblock, keyblock, data, salt)
 krb5_error_code KRB5_CALLCONV
 krb5_init_random_key(context, eblock, keyblock, ptr)
      krb5_context context;
-     const krb5_encrypt_block FAR * eblock;
-     const krb5_keyblock FAR * keyblock;
-     krb5_pointer FAR * ptr;
+     const krb5_encrypt_block * eblock;
+     const krb5_keyblock * keyblock;
+     krb5_pointer * ptr;
 {
     krb5_data data;
 
@@ -151,8 +151,8 @@ krb5_init_random_key(context, eblock, keyblock, ptr)
 krb5_error_code KRB5_CALLCONV
 krb5_finish_random_key(context, eblock, ptr)
      krb5_context context;
-     const krb5_encrypt_block FAR * eblock;
-     krb5_pointer FAR * ptr;
+     const krb5_encrypt_block * eblock;
+     krb5_pointer * ptr;
 {
     return(0);
 }
@@ -160,9 +160,9 @@ krb5_finish_random_key(context, eblock, ptr)
 krb5_error_code KRB5_CALLCONV
 krb5_random_key(context, eblock, ptr, keyblock)
      krb5_context context;
-     const krb5_encrypt_block FAR * eblock;
+     const krb5_encrypt_block * eblock;
      krb5_pointer ptr;
-     krb5_keyblock FAR * FAR * keyblock;
+     krb5_keyblock ** keyblock;
 {
     krb5_keyblock *key;
     krb5_error_code ret;
@@ -181,7 +181,7 @@ krb5_random_key(context, eblock, ptr, keyblock)
 krb5_enctype KRB5_CALLCONV
 krb5_eblock_enctype(context, eblock)
      krb5_context context;
-     const krb5_encrypt_block FAR * eblock;
+     const krb5_encrypt_block * eblock;
 {
     return(eblock->crypto_entry);
 }
@@ -189,7 +189,7 @@ krb5_eblock_enctype(context, eblock)
 krb5_error_code KRB5_CALLCONV
 krb5_use_enctype(context, eblock, enctype)
      krb5_context context;
-     krb5_encrypt_block FAR * eblock;
+     krb5_encrypt_block * eblock;
      const krb5_enctype enctype;
 {
     eblock->crypto_entry = enctype;
@@ -232,7 +232,7 @@ krb5_calculate_checksum(context, ctype, in, in_length,
      const size_t in_length;
      const krb5_pointer seed;
      const size_t seed_length;
-     krb5_checksum FAR * outcksum;
+     krb5_checksum * outcksum;
 {
     krb5_data input;
     krb5_keyblock key;
@@ -269,7 +269,7 @@ krb5_verify_checksum(context, ctype, cksum, in, in_length,
 				     seed, seed_length)
      krb5_context context;
      krb5_cksumtype ctype;
-     const krb5_checksum FAR * cksum;
+     const krb5_checksum * cksum;
      const krb5_pointer in;
      const size_t in_length;
      const krb5_pointer seed;
diff --git a/src/lib/crypto/string_to_cksumtype.c b/src/lib/crypto/string_to_cksumtype.c
index 3ccb9c5f6..873ea9b49 100644
--- a/src/lib/crypto/string_to_cksumtype.c
+++ b/src/lib/crypto/string_to_cksumtype.c
@@ -29,8 +29,8 @@
 
 krb5_error_code KRB5_CALLCONV
 krb5_string_to_cksumtype(string, cksumtypep)
-    char		FAR * string;
-    krb5_cksumtype	FAR * cksumtypep;
+    char		* string;
+    krb5_cksumtype	* cksumtypep;
 {
     int i;
 
diff --git a/src/lib/crypto/string_to_enctype.c b/src/lib/crypto/string_to_enctype.c
index 4485182ba..8862032c6 100644
--- a/src/lib/crypto/string_to_enctype.c
+++ b/src/lib/crypto/string_to_enctype.c
@@ -29,8 +29,8 @@
 
 krb5_error_code KRB5_CALLCONV
 krb5_string_to_enctype(string, enctypep)
-    char		FAR * string;
-    krb5_enctype	FAR * enctypep;
+    char		* string;
+    krb5_enctype	* enctypep;
 {
     int i;