Made the CRYPTO directories work on the PC by adding INTERFACE to all the

functions and prototypes, and updating the Makefile.in.

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

8 files changed, 36 insertions, 22 deletions

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 3579eecd1..55decec66 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 20 16:54:51 1995 Keith Vetter (keithv@fusion.com)
+
+	* encryption.h, los-proto.h, rsa-md5.h: added windows 
+          INTERFACE keyword.
+        * Makefile.in: removed isode cruft ala Feb 10 changes but for windows
+
 Thu Feb 16 20:12:23 1995  John Gilmore  (gnu at toad.com)
 
 	* configure.in:  Use AC_HAVE_HEADER rather than AC_HEADER_CHECK.
diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 53b95d1cd..5ceaa0e65 100644
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -22,8 +22,6 @@ all-windows:
 	copy stock\config.win config.h
 	echo /* not used in windows */ > osconf.h
 	echo /* not used in windows */ > autoconf.h
-	copy $(BUILDTOP)\lib\krb5\asn.1\krb5_decode.h .\asn.1\krb5_decode.h
-	copy $(BUILDTOP)\lib\krb5\asn.1\krb5_encode.h .\asn.1\krb5_encode.h
  
 includes:: autoconf.h
 
diff --git a/src/include/krb5/encryption.h b/src/include/krb5/encryption.h
index 9fa7e5ccd..bbee8ec23 100644
--- a/src/include/krb5/encryption.h
+++ b/src/include/krb5/encryption.h
@@ -61,28 +61,28 @@ typedef struct _krb5_enc_data {
 /* could be used in a table to find an etype and initialize a block */
 typedef struct _krb5_cryptosystem_entry {
     krb5_magic magic;
-    krb5_error_code (*encrypt_func) NPROTOTYPE(( krb5_const_pointer /* in */,
+    krb5_error_code (INTERFACE *encrypt_func) NPROTOTYPE(( krb5_const_pointer /* in */,
 					       krb5_pointer /* out */,
 					       const size_t,
 					       krb5_encrypt_block *,
 					       krb5_pointer));
-    krb5_error_code (*decrypt_func) NPROTOTYPE(( krb5_const_pointer /* in */,
+    krb5_error_code (INTERFACE *decrypt_func) NPROTOTYPE(( krb5_const_pointer /* in */,
 					       krb5_pointer /* out */,
 					       const size_t,
 					       krb5_encrypt_block *,
 					       krb5_pointer));
-    krb5_error_code (*process_key) NPROTOTYPE(( krb5_encrypt_block *,
+    krb5_error_code (INTERFACE *process_key) NPROTOTYPE(( krb5_encrypt_block *,
 					      const krb5_keyblock *));
-    krb5_error_code (*finish_key) NPROTOTYPE(( krb5_encrypt_block *));
-    krb5_error_code (*string_to_key) NPROTOTYPE(( const krb5_encrypt_block *,
+    krb5_error_code (INTERFACE *finish_key) NPROTOTYPE(( krb5_encrypt_block *));
+    krb5_error_code (INTERFACE *string_to_key) NPROTOTYPE(( const krb5_encrypt_block *,
 						 const krb5_keytype,
 						krb5_keyblock *,
 						const krb5_data *,
  	                                        const krb5_data *));
-    krb5_error_code  (*init_random_key) NPROTOTYPE(( const krb5_keyblock *,
+    krb5_error_code  (INTERFACE *init_random_key) NPROTOTYPE(( const krb5_keyblock *,
 						   krb5_pointer *));
-    krb5_error_code  (*finish_random_key) NPROTOTYPE(( krb5_pointer *));
-    krb5_error_code (*random_key) NPROTOTYPE(( const krb5_encrypt_block *,
+    krb5_error_code  (INTERFACE *finish_random_key) NPROTOTYPE(( krb5_pointer *));
+    krb5_error_code (INTERFACE *random_key) NPROTOTYPE(( const krb5_encrypt_block *,
 					      krb5_pointer,
 					      krb5_keyblock **));
     int block_length;
@@ -103,8 +103,9 @@ typedef struct _krb5_cs_table_entry {
 } krb5_cs_table_entry;
 
 /* could be used in a table to find a sumtype */
-typedef krb5_error_code  (API *SUM_FUNC) NPROTOTYPE ((krb5_pointer /* in */,
-		   size_t /* in_length */,
+typedef krb5_error_code  (INTERFACE *SUM_FUNC) NPROTOTYPE (
+			(krb5_pointer /* in */,
+			size_t /* in_length */,
 			krb5_pointer /* key/seed */,
 			size_t /* key/seed size */,
 			krb5_checksum FAR * /* out_cksum */));
diff --git a/src/include/krb5/los-proto.h b/src/include/krb5/los-proto.h
index 3dc63e260..aec2ef0ea 100644
--- a/src/include/krb5/los-proto.h
+++ b/src/include/krb5/los-proto.h
@@ -104,7 +104,7 @@ krb5_error_code krb5_get_realm_domain
 krb5_boolean krb5_kuserok
 	PROTOTYPE((krb5_context,
 		   krb5_principal, const char *));
-krb5_error_code krb5_random_confounder
+krb5_error_code INTERFACE krb5_random_confounder
 	PROTOTYPE((int,
 		   krb5_pointer ));
 krb5_error_code krb5_gen_replay_name
diff --git a/src/include/krb5/rsa-md5.h b/src/include/krb5/rsa-md5.h
index ee180bf65..f315df1ba 100644
--- a/src/include/krb5/rsa-md5.h
+++ b/src/include/krb5/rsa-md5.h
@@ -49,13 +49,13 @@ typedef struct {
 } MD5_CTX;
 
 #if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES)
-extern void MD5Init(MD5_CTX *);
-extern void MD5Update (MD5_CTX *, unsigned char *, unsigned int);
-extern void MD5Final (MD5_CTX *);
+extern void INTERFACE MD5Init(MD5_CTX FAR *);
+extern void INTERFACE MD5Update (MD5_CTX FAR *, unsigned char FAR *, unsigned int);
+extern void INTERFACE MD5Final (MD5_CTX FAR *);
 #else
-extern void MD5Init();
-extern void MD5Update ();
-extern void MD5Final ();
+extern void INTERFACE MD5Init();
+extern void INTERFACE MD5Update ();
+extern void INTERFACE MD5Final ();
 #endif
 
 #define	RSA_MD5_CKSUM_LENGTH		16
diff --git a/src/include/krb5/stock/ChangeLog b/src/include/krb5/stock/ChangeLog
index 09c718247..4bb518084 100644
--- a/src/include/krb5/stock/ChangeLog
+++ b/src/include/krb5/stock/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 20 15:25:26 1995 Keith Vetter (keithv@fusion.com)
+
+	* config.h: changed API to INTERFACE.
+        * config.win: changed API to INTERFACE and changed BITS16
+           to SIZEOF_INT/SIZEOF_LONG to track an autoconf change.
+
 Mon Feb 6 20:5:58 1995 Keith Vetter (keithv@fusion.com)
 
 	* config.win: new file--windows base template for config.h
diff --git a/src/include/krb5/stock/config.h b/src/include/krb5/stock/config.h
index 03ff5f9e2..2a0111438 100644
--- a/src/include/krb5/stock/config.h
+++ b/src/include/krb5/stock/config.h
@@ -80,7 +80,7 @@
  * Windows requires a different api interface to each function. Here
  * just define it as NULL.
  */
-#define API
+#define INTERFACE
 #define FAR
 
 #endif /* KRB5_CONFIG__ */
diff --git a/src/include/krb5/stock/config.win b/src/include/krb5/stock/config.win
index 9ce614b93..abce886ab 100644
--- a/src/include/krb5/stock/config.win
+++ b/src/include/krb5/stock/config.win
@@ -31,6 +31,9 @@
 #define KRB5_KDB5_DBM__                         /* Don't load kdb_dbm.h */
 
 #define BITS16
+#define SIZEOF_INT      2
+#define SIZEOF_SHORT    2
+#define SIZEOF_LONG     4
 
 #define USE_STRING_H 
 #define HAVE_SRAND
@@ -46,8 +49,8 @@ typedef unsigned char u_char;
 #define _U_LONG_DEFINED
 #endif 
 
-#ifndef API
-#define API __far __export __pascal
+#ifndef INTERFACE
+#define INTERFACE __far __export __pascal
 #endif
 #define FAR __far