Windows global stuff:

 o removed INTERFACE from non-api functions
 o add FAR to pointers visible to the world
 o made the tests for __STDC__ also check for _WINDOWS
 o creates GSSAPI.DLL & GSSAPI.LIB as per spec.

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

37 files changed, 135 insertions, 101 deletions

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index 3c669e034..a54982194 100644
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+	* *.[ch]: removed unneeded INTERFACE from non-api functions.
+        * *.h added FAR to pointers visible at to the world.
+
 Tue Mar 28 20:00:00 1995 Keith Vetter (keithv@fusion.com)
 
 	* Makefile.in: more of nmake's strange behavior. Problem goes
diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog
index 24b0660f4..a0b358fa2 100644
--- a/src/lib/crypto/crc32/ChangeLog
+++ b/src/lib/crypto/crc32/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+	* *.[ch]: removed unneeded INTERFACE from non-api functions.
+        * *.h added FAR to pointers visible at to the world.
+
 Thu Mar 16 21:14:15 1995  John Gilmore  (gnu at toad.com)
 
 	* Makefile.in (crctest, crctest.exe):  Replace crctest-unix and
diff --git a/src/lib/crypto/crc32/crc.c b/src/lib/crypto/crc32/crc.c
index cb41e1734..3ecdd75f7 100644
--- a/src/lib/crypto/crc32/crc.c
+++ b/src/lib/crypto/crc32/crc.c
@@ -143,11 +143,11 @@ static u_long const crc_table[256] = {
     0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
     };
 
-krb5_error_code INTERFACE
+krb5_error_code
 crc32_sum_func NPROTOTYPE((krb5_pointer in, size_t in_length,
     krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum));
 
-krb5_error_code INTERFACE
+krb5_error_code
 crc32_sum_func(in, in_length, seed, seed_length, outcksum)
 krb5_pointer in;
 size_t in_length;
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index 4d99e7de5..8b24e7d86 100644
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+	* *.[ch]: removed unneeded INTERFACE from non-api functions.
+        * *.h added FAR to pointers visible at to the world.
+        * f_tables.h: __STDC__ condition also checks _WINDOWS
+
 Tue Mar 28 15:09:43 1995  John Gilmore  (gnu at toad.com)
 
 	Bring in portability fixes from Cygnus K4 release.
diff --git a/src/lib/crypto/des/cbc_cksum.c b/src/lib/crypto/des/cbc_cksum.c
index e4868b4a5..dc795f962 100644
--- a/src/lib/crypto/des/cbc_cksum.c
+++ b/src/lib/crypto/des/cbc_cksum.c
@@ -42,7 +42,7 @@
 
 	returns: errors
 */
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_cbc_checksum(in, in_length, key, key_size, cksum)
     krb5_pointer in;
     size_t in_length;
diff --git a/src/lib/crypto/des/cs_entry.c b/src/lib/crypto/des/cs_entry.c
index 3004961dd..9bf9d7c02 100644
--- a/src/lib/crypto/des/cs_entry.c
+++ b/src/lib/crypto/des/cs_entry.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "des_int.h"
 
-extern krb5_error_code INTERFACE mit_des_cbc_checksum PROTOTYPE ((
+extern krb5_error_code mit_des_cbc_checksum PROTOTYPE ((
                                                         krb5_pointer ,
 							size_t ,
 							krb5_pointer ,
diff --git a/src/lib/crypto/des/des_int.h b/src/lib/crypto/des/des_int.h
index 8da43335f..b19735f56 100644
--- a/src/lib/crypto/des/des_int.h
+++ b/src/lib/crypto/des/des_int.h
@@ -31,85 +31,86 @@
 #include "mit-des.h"		/* From include/krb5 */
 
 /* cbc_cksum.c */
-extern krb5_error_code INTERFACE mit_des_cbc_checksum
+extern krb5_error_code mit_des_cbc_checksum
     PROTOTYPE((krb5_pointer, size_t,krb5_pointer,size_t, krb5_checksum FAR * ));
 
 /* cksum.c */
-extern long INTERFACE mit_des_cbc_cksum
-    PROTOTYPE((krb5_octet *, krb5_octet *, long , mit_des_key_schedule ,
-	       krb5_octet *));
+extern long mit_des_cbc_cksum
+    PROTOTYPE((krb5_octet FAR *, krb5_octet FAR *, long , mit_des_key_schedule ,
+	       krb5_octet FAR *));
 /* des.c */
-extern int INTERFACE mit_des_ecb_encrypt
-    PROTOTYPE((unsigned long *, unsigned long *, mit_des_key_schedule , int ));
+extern int mit_des_ecb_encrypt
+    PROTOTYPE((unsigned long FAR *, unsigned long FAR *, mit_des_key_schedule , int ));
 
 /* f_cbc.c */
-extern int INTERFACE mit_des_cbc_encrypt
-    PROTOTYPE((const mit_des_cblock *in, mit_des_cblock *out, long length,
+extern int mit_des_cbc_encrypt
+    PROTOTYPE((const mit_des_cblock FAR *in, mit_des_cblock FAR *out, long length,
 	       mit_des_key_schedule schedule, mit_des_cblock ivec,
 	       int encrypt));
     
 /* fin_rndkey.c */
-extern krb5_error_code INTERFACE mit_des_finish_random_key
-    PROTOTYPE(( krb5_pointer *));
+extern krb5_error_code mit_des_finish_random_key
+    PROTOTYPE(( krb5_pointer FAR *));
 
 /* finish_key.c */
-extern krb5_error_code INTERFACE mit_des_finish_key
+extern krb5_error_code mit_des_finish_key
     PROTOTYPE(( krb5_encrypt_block FAR *));
 
 /* init_rkey.c */
-extern krb5_error_code INTERFACE mit_des_init_random_key
-    PROTOTYPE(( const krb5_keyblock *,  krb5_pointer *));
+extern krb5_error_code mit_des_init_random_key
+    PROTOTYPE(( const krb5_keyblock FAR *,  krb5_pointer FAR *));
 
 /* key_parity.c */
-extern void INTERFACE mit_des_fixup_key_parity PROTOTYPE((mit_des_cblock ));
-extern int INTERFACE mit_des_check_key_parity PROTOTYPE((mit_des_cblock ));
+extern void mit_des_fixup_key_parity PROTOTYPE((mit_des_cblock ));
+extern int mit_des_check_key_parity PROTOTYPE((mit_des_cblock ));
 
 /* key_sched.c */
-extern int INTERFACE mit_des_key_sched
+extern int mit_des_key_sched
     PROTOTYPE((mit_des_cblock , mit_des_key_schedule ));
 
 /* new_rnd_key.c */
-extern int INTERFACE mit_des_new_random_key
-    PROTOTYPE((mit_des_cblock , mit_des_random_key_seed *));
-extern void INTERFACE mit_des_init_random_number_generator
-    PROTOTYPE((mit_des_cblock, mit_des_random_key_seed *));
-extern void INTERFACE mit_des_set_random_generator_seed
-    PROTOTYPE((mit_des_cblock , mit_des_random_key_seed *));
-extern void INTERFACE mit_des_set_sequence_number
-    PROTOTYPE((mit_des_cblock , mit_des_random_key_seed *));
-extern void INTERFACE mit_des_generate_random_block
-    PROTOTYPE((mit_des_cblock , mit_des_random_key_seed *));
+extern int mit_des_new_random_key
+    PROTOTYPE((mit_des_cblock , mit_des_random_key_seed FAR *));
+extern void mit_des_init_random_number_generator
+    PROTOTYPE((mit_des_cblock, mit_des_random_key_seed FAR *));
+extern void mit_des_set_random_generator_seed
+    PROTOTYPE((mit_des_cblock , mit_des_random_key_seed FAR *));
+extern void mit_des_set_sequence_number
+    PROTOTYPE((mit_des_cblock , mit_des_random_key_seed FAR *));
+extern void mit_des_generate_random_block
+    PROTOTYPE((mit_des_cblock , mit_des_random_key_seed FAR *));
 
 /* process_ky.c */
-extern krb5_error_code INTERFACE mit_des_process_key
-    PROTOTYPE(( krb5_encrypt_block *,  const krb5_keyblock *));
+extern krb5_error_code mit_des_process_key
+    PROTOTYPE(( krb5_encrypt_block FAR *,  const krb5_keyblock FAR *));
 
 /* random_key.c */
-extern krb5_error_code INTERFACE mit_des_random_key
-    PROTOTYPE(( const krb5_encrypt_block *, krb5_pointer ,  krb5_keyblock **));
+extern krb5_error_code mit_des_random_key
+    PROTOTYPE(( const krb5_encrypt_block FAR *, krb5_pointer ,
+                krb5_keyblock FAR * FAR *));
 
 /* string2key.c */
-extern krb5_error_code INTERFACE mit_des_string_to_key
-    PROTOTYPE(( const krb5_encrypt_block *, const krb5_keytype,
-	       krb5_keyblock *, const krb5_data *, const krb5_data *));
+extern krb5_error_code mit_des_string_to_key
+    PROTOTYPE(( const krb5_encrypt_block FAR *, const krb5_keytype,
+	       krb5_keyblock FAR *, const krb5_data FAR *, const krb5_data FAR *));
 
 /* weak_key.c */
-extern int INTERFACE mit_des_is_weak_key PROTOTYPE((mit_des_cblock ));
+extern int mit_des_is_weak_key PROTOTYPE((mit_des_cblock ));
 
 /* cmb_keys.c */
 krb5_error_code mit_des_combine_subkeys
-    PROTOTYPE((const krb5_keyblock *, const krb5_keyblock *,
-	       krb5_keyblock **));
+    PROTOTYPE((const krb5_keyblock FAR *, const krb5_keyblock FAR *,
+	       krb5_keyblock FAR * FAR *));
 
 /* f_pcbc.c */
-int INTERFACE mit_des_pcbc_encrypt ();
+int mit_des_pcbc_encrypt ();
 
 /* f_sched.c */
-int INTERFACE make_key_sched PROTOTYPE((mit_des_cblock, mit_des_key_schedule));
+int make_key_sched PROTOTYPE((mit_des_cblock, mit_des_key_schedule));
 
 
 /* misc.c */
-extern void swap_bits PROTOTYPE((char *));
+extern void swap_bits PROTOTYPE((char FAR *));
 extern unsigned long long_swap_bits PROTOTYPE((unsigned long ));
 extern unsigned long swap_six_bits_to_ansi PROTOTYPE((unsigned long ));
 extern unsigned long swap_four_bits_to_ansi PROTOTYPE((unsigned long ));
diff --git a/src/lib/crypto/des/f_cbc.c b/src/lib/crypto/des/f_cbc.c
index 8b93174db..0e4ffe41d 100644
--- a/src/lib/crypto/des/f_cbc.c
+++ b/src/lib/crypto/des/f_cbc.c
@@ -36,7 +36,7 @@
  * cleartext.
  */
 
-int INTERFACE
+int
 mit_des_cbc_encrypt(in, out, length, schedule, ivec, encrypt)
 	const des_cblock *in;
 	des_cblock *out;
diff --git a/src/lib/crypto/des/f_cksum.c b/src/lib/crypto/des/f_cksum.c
index 05c94c537..17a5db0c2 100644
--- a/src/lib/crypto/des/f_cksum.c
+++ b/src/lib/crypto/des/f_cksum.c
@@ -28,7 +28,7 @@
  * multiple of eight bytes.
  */
 
-unsigned long INTERFACE
+unsigned long
 mit_des_cbc_cksum(in, out, length, schedule, ivec)
 	des_cblock *in;
 	des_cblock *out;
diff --git a/src/lib/crypto/des/f_ecb.c b/src/lib/crypto/des/f_ecb.c
index 133ba1301..f17073ebf 100644
--- a/src/lib/crypto/des/f_ecb.c
+++ b/src/lib/crypto/des/f_ecb.c
@@ -16,7 +16,7 @@
 /*
  * des_ecb_encrypt - {en,de}crypt a block in ECB mode
  */
-int INTERFACE
+int
 mit_des_ecb_encrypt(in, out, schedule, encrypt)
 	des_cblock *in;
 	des_cblock *out;
diff --git a/src/lib/crypto/des/f_parity.c b/src/lib/crypto/des/f_parity.c
index 4d387f198..7244482d7 100644
--- a/src/lib/crypto/des/f_parity.c
+++ b/src/lib/crypto/des/f_parity.c
@@ -20,7 +20,7 @@
 #define pstep(x,step) (((x)&smask(step))^(((x)>>step)&smask(step)))
 #define parity_char(x) pstep(pstep(pstep((x),4),2),1)
 
-void INTERFACE
+void
 mit_des_fixup_key_parity(key)
      register des_cblock key;
 {
@@ -39,7 +39,7 @@ mit_des_fixup_key_parity(key)
  *                       See des_fix_key_parity for the definition of
  *                       correct des parity.
  */
-int INTERFACE
+int
 mit_des_check_key_parity(key)
      register des_cblock key;
 {
diff --git a/src/lib/crypto/des/f_pcbc.c b/src/lib/crypto/des/f_pcbc.c
index efc2ce213..8de7d1aaa 100644
--- a/src/lib/crypto/des/f_pcbc.c
+++ b/src/lib/crypto/des/f_pcbc.c
@@ -16,7 +16,7 @@
 /*
  * des_pcbc_encrypt - {en,de}crypt a stream in PCBC mode
  */
-int INTERFACE
+int
 mit_des_pcbc_encrypt(in, out, length, schedule, ivec, encrypt)
 	des_cblock *in;
 	des_cblock *out;
diff --git a/src/lib/crypto/des/f_sched.c b/src/lib/crypto/des/f_sched.c
index 36a44f41f..7b8c36f7a 100644
--- a/src/lib/crypto/des/f_sched.c
+++ b/src/lib/crypto/des/f_sched.c
@@ -209,7 +209,7 @@ static const unsigned KRB_INT32 PC2_D[4][64] = {
 /*
  * Permute the key to give us our key schedule.
  */
-int INTERFACE
+int
 make_key_sched(key, schedule)
      mit_des_cblock key;
      mit_des_key_schedule schedule;
diff --git a/src/lib/crypto/des/f_tables.h b/src/lib/crypto/des/f_tables.h
index 92ee871af..121fca3aa 100644
--- a/src/lib/crypto/des/f_tables.h
+++ b/src/lib/crypto/des/f_tables.h
@@ -15,7 +15,7 @@
 #define	__DES_TABLES_H__	/* nothing */
 
 #ifndef const
-#ifndef __STDC__
+#if !defined(__STDC__) && !defined(_WINDOWS)
 #define const /* nothing */
 #endif
 #endif
diff --git a/src/lib/crypto/des/fin_rndkey.c b/src/lib/crypto/des/fin_rndkey.c
index 3872cdcb7..ea718b2be 100644
--- a/src/lib/crypto/des/fin_rndkey.c
+++ b/src/lib/crypto/des/fin_rndkey.c
@@ -29,7 +29,7 @@
         free any resources held by "seed" and assigned by init_random_key()
  */
 
-krb5_error_code INTERFACE mit_des_finish_random_key (seed)
+krb5_error_code mit_des_finish_random_key (seed)
     krb5_pointer * seed;
 {
     memset((char *)*seed, 0, sizeof(mit_des_random_key_seed) );
diff --git a/src/lib/crypto/des/finish_key.c b/src/lib/crypto/des/finish_key.c
index d18c7ba3b..0214d1f69 100644
--- a/src/lib/crypto/des/finish_key.c
+++ b/src/lib/crypto/des/finish_key.c
@@ -32,7 +32,7 @@
 	returns: errors
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_finish_key (eblock)
     krb5_encrypt_block FAR * eblock;
 {
diff --git a/src/lib/crypto/des/init_rkey.c b/src/lib/crypto/des/init_rkey.c
index d70cef1e8..c240b9dce 100644
--- a/src/lib/crypto/des/init_rkey.c
+++ b/src/lib/crypto/des/init_rkey.c
@@ -32,7 +32,7 @@
         sequence information.
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_init_random_key (seedblock, seed)
     const krb5_keyblock * seedblock;
     krb5_pointer * seed;
diff --git a/src/lib/crypto/des/key_sched.c b/src/lib/crypto/des/key_sched.c
index 58e5d6d0d..dfe973dcf 100644
--- a/src/lib/crypto/des/key_sched.c
+++ b/src/lib/crypto/des/key_sched.c
@@ -42,7 +42,7 @@
 #include "k5-int.h"
 #include "des_int.h"
 
-int INTERFACE
+int
 mit_des_key_sched(k,schedule)
     mit_des_cblock k;
     mit_des_key_schedule schedule;
diff --git a/src/lib/crypto/des/new_rn_key.c b/src/lib/crypto/des/new_rn_key.c
index 63f68c472..ac72bb622 100644
--- a/src/lib/crypto/des/new_rn_key.c
+++ b/src/lib/crypto/des/new_rn_key.c
@@ -47,7 +47,7 @@
  *        to be a weak des key.  Mit_Des_generate_random_block is used to
  *        provide the random bits.
  */
-int INTERFACE
+int
 mit_des_new_random_key(key, p_seed)
     mit_des_cblock key;
     mit_des_random_key_seed	*p_seed;
@@ -75,7 +75,7 @@ mit_des_new_random_key(key, p_seed)
  * Note: this routine calls mit_des_set_random_generator_seed.
  */
 
-void INTERFACE
+void
 mit_des_init_random_number_generator(key,p_seed)
     mit_des_cblock key;
     mit_des_random_key_seed	*p_seed;
@@ -156,7 +156,7 @@ mit_des_init_random_number_generator(key,p_seed)
  * Requires: key is a valid des key.  I.e., has correct parity and is not a
  *           weak des key.
  */
-void INTERFACE
+void
 mit_des_set_random_generator_seed(key, p_seed)
     mit_des_cblock key;
     mit_des_random_key_seed	*p_seed;
@@ -179,7 +179,7 @@ mit_des_set_random_generator_seed(key, p_seed)
  *
  * Note that mit_des_set_random_generator_seed resets the sequence number to 0.
  */
-void INTERFACE
+void
 mit_des_set_sequence_number(new_sequence_number, p_seed)
     mit_des_cblock new_sequence_number;
     mit_des_random_key_seed	*p_seed;
@@ -196,7 +196,7 @@ mit_des_set_sequence_number(new_sequence_number, p_seed)
  * Requires: mit_des_set_random_generator_seed must have been called at least once
  *           before this routine is called.
  */
-void INTERFACE
+void
 mit_des_generate_random_block(block, p_seed)
     mit_des_cblock block;
     mit_des_random_key_seed	*p_seed;
diff --git a/src/lib/crypto/des/process_ky.c b/src/lib/crypto/des/process_ky.c
index d21bd93be..201f0745a 100644
--- a/src/lib/crypto/des/process_ky.c
+++ b/src/lib/crypto/des/process_ky.c
@@ -38,7 +38,7 @@
         returns: errors
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_process_key (eblock, keyblock)
     krb5_encrypt_block * eblock;
     const krb5_keyblock * keyblock;
diff --git a/src/lib/crypto/des/random_key.c b/src/lib/crypto/des/random_key.c
index 055b0fa75..bf5f60a6d 100644
--- a/src/lib/crypto/des/random_key.c
+++ b/src/lib/crypto/des/random_key.c
@@ -29,7 +29,7 @@
         filling in the keyblock address in *keyblock
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_random_key (eblock, seed, keyblock)
     const krb5_encrypt_block * eblock;
     krb5_pointer seed;
diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c
index b9dd7115d..7eb58affb 100644
--- a/src/lib/crypto/des/string2key.c
+++ b/src/lib/crypto/des/string2key.c
@@ -40,7 +40,7 @@
 	returns: errors
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_string_to_key (eblock, keytype, keyblock, data, salt)
 const krb5_encrypt_block FAR * eblock;
 const krb5_keytype keytype;
@@ -61,7 +61,9 @@ const krb5_data FAR * salt;
     char k_char[64];
     mit_des_key_schedule key_sked;
 
+#ifndef min
 #define min(A, B) ((A) < (B) ? (A): (B))
+#endif
 
     if ( keytype != KEYTYPE_DES )
 	return (KRB5_PROG_KEYTYPE_NOSUPP);
diff --git a/src/lib/crypto/des/weak_key.c b/src/lib/crypto/des/weak_key.c
index 50f21354d..bc6b20264 100644
--- a/src/lib/crypto/des/weak_key.c
+++ b/src/lib/crypto/des/weak_key.c
@@ -67,7 +67,7 @@ static mit_des_cblock weak[16] = {
  *
  * Requires: key has correct odd parity.
  */
-int INTERFACE
+int
 mit_des_is_weak_key(key)
      mit_des_cblock key;
 {
diff --git a/src/lib/crypto/des_crc.c b/src/lib/crypto/des_crc.c
index 90bbe87ed..b0f3f1ff4 100644
--- a/src/lib/crypto/des_crc.c
+++ b/src/lib/crypto/des_crc.c
@@ -25,11 +25,11 @@
 #include "crc-32.h"
 #include "des_int.h"
 
-krb5_error_code INTERFACE mit_des_crc_encrypt_func
+krb5_error_code mit_des_crc_encrypt_func
     PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
                krb5_encrypt_block *, krb5_pointer ));
 
-krb5_error_code INTERFACE mit_des_crc_decrypt_func
+krb5_error_code mit_des_crc_decrypt_func
     PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
                krb5_encrypt_block *, krb5_pointer ));
 
@@ -58,7 +58,7 @@ krb5_cs_table_entry krb5_des_crc_cst_entry = {
     };
 
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_crc_encrypt_func(in, out, size, key, ivec)
     krb5_const_pointer in;
     krb5_pointer out;
@@ -123,7 +123,7 @@ mit_des_crc_encrypt_func(in, out, size, key, ivec)
     
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_crc_decrypt_func(in, out, size, key, ivec)
     krb5_const_pointer in;
     krb5_pointer out;
diff --git a/src/lib/crypto/des_md5.c b/src/lib/crypto/des_md5.c
index 35ef6e514..e0c80a746 100644
--- a/src/lib/crypto/des_md5.c
+++ b/src/lib/crypto/des_md5.c
@@ -25,11 +25,11 @@
 #include "rsa-md5.h"
 #include "des_int.h"
 
-krb5_error_code INTERFACE mit_des_md5_encrypt_func
+krb5_error_code mit_des_md5_encrypt_func
     PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
                krb5_encrypt_block *, krb5_pointer ));
 
-krb5_error_code INTERFACE mit_des_md5_decrypt_func
+krb5_error_code mit_des_md5_decrypt_func
     PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
                krb5_encrypt_block *, krb5_pointer ));
 
@@ -59,7 +59,7 @@ krb5_cs_table_entry krb5_des_md5_cst_entry = {
     };
 
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_md5_encrypt_func(in, out, size, key, ivec)
     krb5_const_pointer in;
     krb5_pointer out;
@@ -124,7 +124,7 @@ mit_des_md5_encrypt_func(in, out, size, key, ivec)
     
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_des_md5_decrypt_func(in, out, size, key, ivec)
     krb5_const_pointer in;
     krb5_pointer out;
diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog
index cddab1d7b..e63e68121 100644
--- a/src/lib/crypto/md4/ChangeLog
+++ b/src/lib/crypto/md4/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+	* *.[ch]: removed unneeded INTERFACE from non-api functions.
+        * *.h added FAR to pointers visible at to the world.
+        * rsa-md4.h: __STDC__ condition also checks _WINDOWS
+
 Thu Mar 16 21:19:55 1995  John Gilmore  (gnu at toad.com)
 
 	* Makefile.in (CFLAGS):  Tweak for Unix->MPW converter.
diff --git a/src/lib/crypto/md4/md4.c b/src/lib/crypto/md4/md4.c
index 16f6a2b4b..a07c8611a 100644
--- a/src/lib/crypto/md4/md4.c
+++ b/src/lib/crypto/md4/md4.c
@@ -38,14 +38,14 @@
 #include "k5-int.h"
 #include "rsa-md4.h"
 
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
 #define UL(x) x##UL
 #else
 #define UL(x) ((krb5_ui_4) x)
 #endif    
 
 /* forward declaration */
-#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES)
+#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS)
 static void Transform (krb5_ui_4 FAR *, krb5_ui_4 FAR *);
 #else
 static void Transform ();
@@ -82,7 +82,7 @@ static unsigned char PADDING[64] = {
   {(a) += H ((b), (c), (d)) + (x) + UL(015666365641); \
    (a) = ROTATE_LEFT ((a), (s));}
 
-void INTERFACE
+void
 MD4Init (mdContext)
 MD4_CTX FAR *mdContext;
 {
@@ -96,7 +96,7 @@ MD4_CTX FAR *mdContext;
   mdContext->buf[3] = UL(0x10325476);
 }
 
-void INTERFACE
+void
 MD4Update (mdContext, inBuf, inLen)
 MD4_CTX FAR *mdContext;
 unsigned char FAR *inBuf;
@@ -132,7 +132,7 @@ unsigned int inLen;
   }
 }
 
-void INTERFACE
+void
 MD4Final (mdContext)
 MD4_CTX FAR *mdContext;
 {
diff --git a/src/lib/crypto/md4/md4crypto.c b/src/lib/crypto/md4/md4crypto.c
index 38a3a4a3b..58301f2bf 100644
--- a/src/lib/crypto/md4/md4crypto.c
+++ b/src/lib/crypto/md4/md4crypto.c
@@ -28,11 +28,11 @@
 #include "rsa-md4.h"
 #include "des_int.h"	/* we cheat a bit and call it directly... */
 
-krb5_error_code INTERFACE
+krb5_error_code
 md4_crypto_sum_func NPROTOTYPE((krb5_pointer in, size_t in_length,
     krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum));
 
-krb5_error_code INTERFACE
+krb5_error_code
 md4_crypto_sum_func(in, in_length, seed, seed_length, outcksum)
 krb5_pointer in;
 size_t in_length;
diff --git a/src/lib/crypto/md4/md4glue.c b/src/lib/crypto/md4/md4glue.c
index deebff54a..3a3d2e7da 100644
--- a/src/lib/crypto/md4/md4glue.c
+++ b/src/lib/crypto/md4/md4glue.c
@@ -26,11 +26,11 @@
 #include "k5-int.h"
 #include "rsa-md4.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 md4_sum_func NPROTOTYPE((krb5_pointer in, size_t in_length,
     krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum));
 
-krb5_error_code INTERFACE
+krb5_error_code
 md4_sum_func(in, in_length, seed, seed_length, outcksum)
 krb5_pointer in;
 size_t in_length;
diff --git a/src/lib/crypto/md4/rsa-md4.h b/src/lib/crypto/md4/rsa-md4.h
index 0fdf17f15..c03b6cb47 100644
--- a/src/lib/crypto/md4/rsa-md4.h
+++ b/src/lib/crypto/md4/rsa-md4.h
@@ -84,14 +84,14 @@ typedef struct {
   unsigned char digest[16];		/* actual digest after MD4Final call */
 } MD4_CTX;
 
-#ifdef __STDC__
-extern void INTERFACE MD4Init(MD4_CTX FAR *);
-extern void INTERFACE MD4Update(MD4_CTX FAR *, unsigned char FAR *, unsigned int);
-extern void INTERFACE MD4Final(MD4_CTX FAR *);
+#if defined(__STDC__) || defined(_WINDOWS)
+extern void MD4Init(MD4_CTX FAR *);
+extern void MD4Update(MD4_CTX FAR *, unsigned char FAR *, unsigned int);
+extern void MD4Final(MD4_CTX FAR *);
 #else
-void INTERFACE MD4Init ();
-void INTERFACE MD4Update ();
-void INTERFACE MD4Final ();
+void MD4Init ();
+void MD4Update ();
+void MD4Final ();
 #endif
 
 /*
diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog
index 4d791624e..dd52074f8 100644
--- a/src/lib/crypto/md5/ChangeLog
+++ b/src/lib/crypto/md5/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+	* *.[ch]: removed unneeded INTERFACE from non-api functions.
+        * *.h added FAR to pointers visible at to the world.
+
 Thu Mar 16 21:23:03 1995  John Gilmore  (gnu at toad.com)
 
 	* Makefile.in (LDFLAGS):  Remove, conflicts with pre.in.
diff --git a/src/lib/crypto/md5/md5.c b/src/lib/crypto/md5/md5.c
index 885bdb426..beff1a2de 100644
--- a/src/lib/crypto/md5/md5.c
+++ b/src/lib/crypto/md5/md5.c
@@ -38,7 +38,7 @@
 #include "k5-int.h"
 #include "rsa-md5.h"
 
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_WINDOWS)
 #define UL(x) x##UL
 #else
 #define UL(x) ((krb5_ui_4) x)
@@ -104,7 +104,7 @@ static unsigned char PADDING[64] = {
 /* The routine MD5Init initializes the message-digest context
    mdContext. All fields are set to zero.
  */
-void INTERFACE 
+void 
 MD5Init (mdContext)
 MD5_CTX FAR *mdContext;
 {
@@ -122,7 +122,7 @@ MD5_CTX FAR *mdContext;
    account for the presence of each of the characters inBuf[0..inLen-1]
    in the message whose digest is being computed.
  */
-void INTERFACE
+void
 MD5Update (mdContext, inBuf, inLen)
 MD5_CTX FAR *mdContext;
 unsigned char FAR *inBuf;
@@ -161,7 +161,7 @@ unsigned int inLen;
 /* The routine MD5Final terminates the message-digest computation and
    ends with the desired message digest in mdContext->digest[0...15].
  */
-void INTERFACE
+void
 MD5Final (mdContext)
 MD5_CTX FAR *mdContext;
 {
diff --git a/src/lib/crypto/md5/md5crypto.c b/src/lib/crypto/md5/md5crypto.c
index bb2fba504..bacbb97d7 100644
--- a/src/lib/crypto/md5/md5crypto.c
+++ b/src/lib/crypto/md5/md5crypto.c
@@ -2,11 +2,11 @@
 #include "rsa-md5.h"
 #include "des_int.h"	/* we cheat a bit and call it directly... */
 
-krb5_error_code INTERFACE
+krb5_error_code
 md5_crypto_sum_func NPROTOTYPE((krb5_pointer in, size_t in_length,
     krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum));
 
-krb5_error_code INTERFACE
+krb5_error_code
 md5_crypto_sum_func(in, in_length, seed, seed_length, outcksum)
 krb5_pointer in;
 size_t in_length;
diff --git a/src/lib/crypto/md5/md5glue.c b/src/lib/crypto/md5/md5glue.c
index 4514c895f..01282ffaf 100644
--- a/src/lib/crypto/md5/md5glue.c
+++ b/src/lib/crypto/md5/md5glue.c
@@ -1,11 +1,11 @@
 #include "k5-int.h"
 #include "rsa-md5.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 md5_sum_func NPROTOTYPE((krb5_pointer in, size_t in_length,
     krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum));
 
-krb5_error_code INTERFACE
+krb5_error_code
 md5_sum_func(in, in_length, seed, seed_length, outcksum)
 krb5_pointer in;
 size_t in_length;
diff --git a/src/lib/crypto/os/ChangeLog b/src/lib/crypto/os/ChangeLog
index c6d2bdeb3..465ec902b 100644
--- a/src/lib/crypto/os/ChangeLog
+++ b/src/lib/crypto/os/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+	* *.[ch]: removed unneeded INTERFACE from non-api functions.
+
 Sat Mar 25 15:38:23 1995  Mark Eichin  <eichin@cygnus.com>
 
 	* Makefile.in (memmove.c): memmove.c is in krb5/posix, not krb5/os.
diff --git a/src/lib/crypto/os/rnd_confoun.c b/src/lib/crypto/os/rnd_confoun.c
index 7021ec7d5..8db32d156 100644
--- a/src/lib/crypto/os/rnd_confoun.c
+++ b/src/lib/crypto/os/rnd_confoun.c
@@ -60,7 +60,7 @@ You need a random number generator!
 /*
  * Generate a random confounder
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_random_confounder(size, fillin)
 int size;
 krb5_pointer fillin;
diff --git a/src/lib/crypto/raw_des.c b/src/lib/crypto/raw_des.c
index e1a956f77..8bb889abc 100644
--- a/src/lib/crypto/raw_des.c
+++ b/src/lib/crypto/raw_des.c
@@ -24,11 +24,11 @@
 #include "k5-int.h"
 #include "des_int.h"
 
-krb5_error_code INTERFACE mit_raw_des_encrypt_func
+krb5_error_code mit_raw_des_encrypt_func
     PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
                krb5_encrypt_block *, krb5_pointer ));
 
-krb5_error_code INTERFACE mit_raw_des_decrypt_func
+krb5_error_code mit_raw_des_decrypt_func
     PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
                krb5_encrypt_block *, krb5_pointer ));
 
@@ -55,7 +55,7 @@ krb5_cs_table_entry krb5_raw_des_cst_entry = {
     0
     };
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_raw_des_decrypt_func(in, out, size, key, ivec)
     krb5_const_pointer in;
     krb5_pointer out;
@@ -71,7 +71,7 @@ mit_raw_des_decrypt_func(in, out, size, key, ivec)
 				 MIT_DES_DECRYPT));
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 mit_raw_des_encrypt_func(in, out, size, key, ivec)
     krb5_const_pointer in;
     krb5_pointer out;