Converted krb5/des425 and krb5/asn.1 to the PC

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

15 files changed, 88 insertions, 51 deletions

diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index e5a298ccf..a9439e803 100644
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,10 @@
+Tue Feb 21 17:42:44 1995 Keith Vetter (keithv@fusion.com)
+
+        * Makefile.in: made to work on the PC
+	* *.c, des.h: added windows INTERFACE keyword
+        * read_passwd.c: renamed a static variable to avoid compiler error
+        * quad_cksum.c: errno extern declaration removed on the PC
+
 Fri Feb  3 17:23:45 1995  Theodore Y. Ts'o  (tytso@dcl)
 
 	* pcbc_encrypt.c: Add SIZEOF_FOO checks to properly define
diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index 650c8dded..517100049 100644
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -1,20 +1,22 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../crypto/des
 LDFLAGS = -g
 
-all:: $(OBJS)
+##DOSBUILDTOP = ..\..
+##DOSLIBNAME=libdes425.lib
+##DOS!include $(BUILDTOP)\config\windows.in
 
-OBJS=	cksum.o		\
-	des.o		\
-	enc_dec.o	\
-	key_parity.o	\
-	key_sched.o	\
-	new_rnd_key.o	\
-	pcbc_encrypt.o	\
-	quad_cksum.o	\
-	random_key.o	\
-	read_passwd.o \
-	str_to_key.o	\
-	weak_key.o	
+OBJS=	cksum.$(OBJEXT)		\
+	des.$(OBJEXT)		\
+	enc_dec.$(OBJEXT)	\
+	key_parity.$(OBJEXT)	\
+	key_sched.$(OBJEXT)	\
+	new_rnd_key.$(OBJEXT)	\
+	pcbc_encrypt.$(OBJEXT)	\
+	quad_cksum.$(OBJEXT)	\
+	random_key.$(OBJEXT)	\
+	read_passwd.$(OBJEXT) \
+	str_to_key.$(OBJEXT)	\
+	weak_key.$(OBJEXT)	
 
 SRCS=	$(srcdir)/cksum.c	\
 	$(srcdir)/des.c		\
@@ -33,16 +35,22 @@ SRCS=	$(srcdir)/cksum.c	\
 EXT_LIB= libdes425.a $(TOPLIBD)/libcrypto.a
 DEPKLIB= $(TOPLIBD)/libcrypto.a
 
+all:: $(OBJS)
+
 verify: verify.o libdes425.a $(DEPKLIB)
 	$(CC) -o $@ verify.o $(LDFLAGS) $(EXT_LIB)
 
-check:: verify
+check:: check-$(WHAT)
+
+check-unix:: verify
 	./verify -z
 	./verify -m
 	./verify
 
+check-windows::
+
 clean::
-	$(RM) verify
+	$(RM) verify$(EXEEXT)
 
 libdes425.a: $(OBJS)
 	$(RM) $@
@@ -57,5 +65,5 @@ install:: libdes425.a
 	$(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libdes425.a
 
 clean::
-	$(RM) libdes425.a
+	$(RM) libdes425.$(LIBEXT) libdes425.bak
 
diff --git a/src/lib/des425/cksum.c b/src/lib/des425/cksum.c
index 54baae270..519b4ac4c 100644
--- a/src/lib/des425/cksum.c
+++ b/src/lib/des425/cksum.c
@@ -53,7 +53,7 @@
  * multiple of eight bytes.
  */
 
-void
+void INTERFACE
 des_cbc_cksum(in,out,length,key,iv)
     krb5_octet  *in;		/* >= length bytes of inputtext */
     krb5_octet  *out;		/* >= length bytes of outputtext */
diff --git a/src/lib/des425/des.c b/src/lib/des425/des.c
index 2ab8dad26..93e07e65a 100644
--- a/src/lib/des425/des.c
+++ b/src/lib/des425/des.c
@@ -52,7 +52,7 @@
 #include "des.h"
 #include <krb5/ext-proto.h>
 
-int
+int INTERFACE
 des_ecb_encrypt(clear, cipher, schedule, encrypt)
     unsigned long *clear;
     unsigned long *cipher;
diff --git a/src/lib/des425/des.h b/src/lib/des425/des.h
index 4f27ece2b..7d4f61599 100644
--- a/src/lib/des425/des.h
+++ b/src/lib/des425/des.h
@@ -63,4 +63,25 @@ typedef struct des_ks_struct bit_64;
 
 #define des_cblock_print(x) des_cblock_print_file(x, stdout)
 
+/*
+ * Windows needs everything prototyped because we're exporting all the fuctions.
+ */
+void INTERFACE des_cbc_cksum();
+int INTERFACE des_ecb_encrypt();
+int INTERFACE des_cbc_encrypt();
+void INTERFACE des_fixup_key_parity();
+int INTERFACE des_check_key_parity();
+int INTERFACE des_key_sched();
+int INTERFACE des_new_random_key();
+void INTERFACE des_init_random_number_generator();
+void INTERFACE des_set_random_generator_seed();
+void INTERFACE des_set_sequence_number();
+void INTERFACE des_generate_random_block();
+int INTERFACE des_pcbc_encrypt();
+unsigned long INTERFACE des_quad_cksum();
+int INTERFACE des_random_key();
+int INTERFACE des_read_password();
+int INTERFACE des_string_to_key();
+int INTERFACE des_is_weak_key();
+
 #endif	/* DES_DEFS */
diff --git a/src/lib/des425/enc_dec.c b/src/lib/des425/enc_dec.c
index 65c3738bb..a221a3483 100644
--- a/src/lib/des425/enc_dec.c
+++ b/src/lib/des425/enc_dec.c
@@ -58,7 +58,7 @@
  * cleartext.
  */
 
-int
+int INTERFACE
 des_cbc_encrypt(in,out,length,key,iv,encrypt)
     krb5_octet   *in;		/* >= length bytes of input text */
     krb5_octet  *out;		/* >= length bytes of output text */
diff --git a/src/lib/des425/key_parity.c b/src/lib/des425/key_parity.c
index 4bb593425..910c099d3 100644
--- a/src/lib/des425/key_parity.c
+++ b/src/lib/des425/key_parity.c
@@ -39,7 +39,7 @@
  *                       8,16,...64 in des order, implies 0, 8, 16, ...
  *                       vax order.
  */
-void
+void INTERFACE
 des_fixup_key_parity(key)
      register mit_des_cblock key;
 {
@@ -51,7 +51,7 @@ des_fixup_key_parity(key)
  *                       See des_fix_key_parity for the definition of
  *                       correct des parity.
  */
-int
+int INTERFACE
 des_check_key_parity(key)
      register mit_des_cblock key;
 {
diff --git a/src/lib/des425/key_sched.c b/src/lib/des425/key_sched.c
index f30ef01ed..c801f1344 100644
--- a/src/lib/des425/key_sched.c
+++ b/src/lib/des425/key_sched.c
@@ -53,7 +53,7 @@ typedef char key[64];
 /* the following are really void but cc86 doesnt allow it */
 static void make_key_sched PROTOTYPE((key, mit_des_key_schedule));
 
-int
+int INTERFACE
 des_key_sched(k,schedule)
     register mit_des_cblock k;	/* r11 */
     mit_des_key_schedule schedule;
diff --git a/src/lib/des425/new_rnd_key.c b/src/lib/des425/new_rnd_key.c
index f6a442042..3ade2ce13 100644
--- a/src/lib/des425/new_rnd_key.c
+++ b/src/lib/des425/new_rnd_key.c
@@ -26,18 +26,16 @@
 
 #include "des.h"
 
-extern void mit_des_fixup_key_parity();
-extern int mit_des_is_weak_key();
-extern int mit_des_init_random_number_generator();
-extern void mit_des_set_random_generator_seed();
-extern void mit_des_set_sequence_number();
-extern void mit_des_generate_random_block();
-extern int mit_des_new_random_key();
-extern void mit_des_generate_random_block();
+extern int INTERFACE mit_des_init_random_number_generator();
+extern void INTERFACE mit_des_set_random_generator_seed();
+extern void INTERFACE mit_des_set_sequence_number();
+extern void INTERFACE mit_des_generate_random_block();
+extern int INTERFACE mit_des_new_random_key();
 
 
-void des_set_random_generator_seed(), des_set_sequence_number();
-void des_generate_random_block();
+void INTERFACE des_set_random_generator_seed();
+void INTERFACE des_set_sequence_number();
+void INTERFACE des_generate_random_block();
 
 /*
  * The secret des key schedule and sequence number for the current
@@ -55,7 +53,7 @@ static mit_des_random_key_seed random_sequence_state;
  *        to be a weak des key.  Des_generate_random_block is used to
  *        provide the random bits.
  */
-int
+int INTERFACE
 des_new_random_key(key)
     mit_des_cblock key;
 {
@@ -76,7 +74,8 @@ des_new_random_key(key)
  *
  * Note: this routine calls des_set_random_generator_seed.
  */
-void des_init_random_number_generator(key)
+void INTERFACE
+des_init_random_number_generator(key)
      mit_des_cblock key;
 {
      mit_des_init_random_number_generator(key, &random_sequence_state);
@@ -99,7 +98,7 @@ void des_init_random_number_generator(key)
  * Requires: key is a valid des key.  I.e., has correct parity and is not a
  *           weak des key.
  */
-void
+void INTERFACE
 des_set_random_generator_seed(key)
      mit_des_cblock key;
 {
@@ -115,7 +114,7 @@ des_set_random_generator_seed(key)
  *
  * Note that des_set_random_generator_seed resets the sequence number to 0.
  */
-void
+void INTERFACE
 des_set_sequence_number(new_sequence_number)
      mit_des_cblock new_sequence_number;
 {
@@ -130,7 +129,8 @@ des_set_sequence_number(new_sequence_number)
  * Requires: des_set_random_generator_seed must have been called at least once
  *           before this routine is called.
  */
-void des_generate_random_block(block)
+void INTERFACE
+des_generate_random_block(block)
      mit_des_cblock block;
 {
     mit_des_generate_random_block(block, &random_sequence_state);
diff --git a/src/lib/des425/pcbc_encrypt.c b/src/lib/des425/pcbc_encrypt.c
index f0793355b..06258cf8b 100644
--- a/src/lib/des425/pcbc_encrypt.c
+++ b/src/lib/des425/pcbc_encrypt.c
@@ -18,7 +18,8 @@
 /* 
  * copy of include/des.h to avoid collision with local one
  */
-#include <kerberosIV/mit-copyright.h>
+#include <krb5/copyright.h>
+#include <krb5/config.h>
 #include <krb5/osconf.h>
 
 #ifndef KRB_INT32
@@ -71,7 +72,7 @@ typedef struct des_ks_struct bit_64;
 /*
  * des_pcbc_encrypt - {en,de}crypt a stream in PCBC mode
  */
-int
+int INTERFACE
 des_pcbc_encrypt(in, out, length, schedule, ivec, encrypt)
 	des_cblock *in;
 	des_cblock *out;
diff --git a/src/lib/des425/quad_cksum.c b/src/lib/des425/quad_cksum.c
index b27b5424e..0a9628b48 100644
--- a/src/lib/des425/quad_cksum.c
+++ b/src/lib/des425/quad_cksum.c
@@ -100,12 +100,14 @@
 
 /* Externals */
 extern char *errmsg();
+#ifndef HAVE_ERRNO
 extern int errno;
+#endif
 extern int des_debug;
 
 /*** Routines ***************************************************** */
 
-unsigned long
+unsigned long INTERFACE
 des_quad_cksum(in,out,length,out_count,c_seed)
     mit_des_cblock *c_seed;		/* secret seed, 8 bytes */
     unsigned char *in;		/* input block */
diff --git a/src/lib/des425/random_key.c b/src/lib/des425/random_key.c
index d4f1f187b..498f8848d 100644
--- a/src/lib/des425/random_key.c
+++ b/src/lib/des425/random_key.c
@@ -27,7 +27,7 @@
 #include "des.h"
 
 /* random_key */
-int
+int INTERFACE
 des_random_key(key)
     mit_des_cblock *key;
 {
diff --git a/src/lib/des425/read_passwd.c b/src/lib/des425/read_passwd.c
index 533165061..d6f0c78fc 100644
--- a/src/lib/des425/read_passwd.c
+++ b/src/lib/des425/read_passwd.c
@@ -33,10 +33,10 @@
 
 #include "des.h"
 
-static krb5_context global_context = 0;
+static krb5_context krb4_global_context = 0;
 
 /*** Routines ****************************************************** */
-int
+int INTERFACE
 des_read_password/*_v4_compat_crock*/(k,prompt,verify)
     mit_des_cblock *k;
     char *prompt;
@@ -48,8 +48,8 @@ des_read_password/*_v4_compat_crock*/(k,prompt,verify)
     char prompt2[BUFSIZ];
     int string_size = sizeof(key_string);
 
-    if (!global_context) {
-	    retval = krb5_init_context(&global_context);
+    if (!krb4_global_context) {
+	    retval = krb5_init_context(&krb4_global_context);
 	    if (retval)
 		    return retval;
     }
@@ -58,7 +58,7 @@ des_read_password/*_v4_compat_crock*/(k,prompt,verify)
 	strcpy(prompt2, "Verifying, please re-enter ");
 	strncat(prompt2, prompt, sizeof(prompt2)-(strlen(prompt2)+1));
     }
-    ok = krb5_read_password(global_context, prompt, verify ? prompt2 : 0,
+    ok = krb5_read_password(krb4_global_context, prompt, verify ? prompt2 : 0,
 			    key_string, &string_size);
     
     if (ok == 0)
diff --git a/src/lib/des425/str_to_key.c b/src/lib/des425/str_to_key.c
index 5a8d6de6f..4330e44cd 100644
--- a/src/lib/des425/str_to_key.c
+++ b/src/lib/des425/str_to_key.c
@@ -44,13 +44,11 @@
 /*   #include "des_internal.h" */
 
 extern int mit_des_debug;
-extern int mit_des_debug_print();
-extern void mit_des_fixup_key_parity();
 
 /*
  * convert an arbitrary length string to a DES key
  */
-int
+int INTERFACE
 des_string_to_key(str,key)
     char *str;
     register mit_des_cblock *key;
@@ -64,7 +62,7 @@ des_string_to_key(str,key)
     register char *p_char;
     static char k_char[64];
     static mit_des_key_schedule key_sked;
-    extern unsigned long des_cbc_cksum();
+    extern void INTERFACE des_cbc_cksum();
 
     in_str = str;
     forward = 1;
diff --git a/src/lib/des425/weak_key.c b/src/lib/des425/weak_key.c
index 1e481525f..14f67eabd 100644
--- a/src/lib/des425/weak_key.c
+++ b/src/lib/des425/weak_key.c
@@ -38,7 +38,7 @@
  *
  * Requires: key has correct odd parity.
  */
-int
+int INTERFACE
 des_is_weak_key(key)
      mit_des_cblock key;
 {