Windows/NT integration (V1_0_WIN32_BRANCH merge)

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

9 files changed, 57 insertions, 15 deletions

diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 8b1457e07b..2acf19bac9 100644
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,11 @@
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* des.c, des.h, key_sched.c, new_rnd_key.c, pcbc_encrypt.c,
+	read_passwd.c, unix_time.c:
+		DLL export various functions (mostly for wintel)
+
 Mon Nov 18 20:39:02 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* configure.in: Set shared library version to 1.0. [krb5-libs/201]
diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index 4c1f14ab51..c8e5139960 100644
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -1,7 +1,11 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../crypto/des -I$(srcdir)/../../include/kerberosIV
 
 ##DOSBUILDTOP = ..\..
-##DOSLIBNAME=libdes425.lib
+##DOSLIBNAME=des425.lib
+##DOSOBJFILE=des425.lst
+##DOSOBJFILEDEP=des425.lst
+##DOSOBJFILELIST=@des425.lst
+
 RUN_SETUP=@KRB5_RUN_ENV@
 
 .c.o:
@@ -17,7 +21,7 @@ OBJS=	cksum.$(OBJEXT)		\
 	pcbc_encrypt.$(OBJEXT)	\
 	quad_cksum.$(OBJEXT)	\
 	random_key.$(OBJEXT)	\
-	read_passwd.$(OBJEXT) \
+	read_passwd.$(OBJEXT)	\
 	str_to_key.$(OBJEXT)	\
 	unix_time.$(OBJEXT)     \
 	util.$(OBJEXT)		\
@@ -34,7 +38,7 @@ SRCS=	$(srcdir)/cksum.c	\
 	$(srcdir)/quad_cksum.c	\
 	$(srcdir)/random_key.c	\
 	$(srcdir)/read_passwd.c \
-	$(srcdir)/str_to_key.c \
+	$(srcdir)/str_to_key.c	\
 	$(srcdir)/unix_time.c   \
 	$(srcdir)/util.c	\
 	$(srcdir)/weak_key.c	\
@@ -57,7 +61,12 @@ DEPKLIB= $(TOPLIBD)/libcrypto.a
 
 all-unix:: shared $(OBJS)
 all-mac:: $(OBJS)
-all-windows:: $(OBJS)
+all-windows:: $(OBJFILE)
+
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) *.obj > $(OBJFILE)
 
 shared:
 	mkdir shared
@@ -80,6 +89,7 @@ clean-unix::
 
 clean-mac::
 clean-windows::
+	$(RM) des425.lib des425.bak $(OBJFILE)
 
 libdes425.$(STEXT): $(OBJS)
 	$(RM) $@
diff --git a/src/lib/des425/des.c b/src/lib/des425/des.c
index 12e8c3ea7b..6b08899b7f 100644
--- a/src/lib/des425/des.c
+++ b/src/lib/des425/des.c
@@ -51,7 +51,7 @@
 
 #include "des.h"
 
-int
+KRB5_DLLIMP int KRB5_CALLCONV
 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 9ec87ddc39..2aed529bb4 100644
--- a/src/lib/des425/des.h
+++ b/src/lib/des425/des.h
@@ -67,14 +67,14 @@ typedef struct des_ks_struct bit_64;
  * Windows needs everything prototyped because we're exporting all the fuctions.
  */
 void des_cbc_cksum();
-int des_ecb_encrypt();
+KRB5_DLLIMP int KRB5_CALLCONV des_ecb_encrypt();
 int des_cbc_encrypt();
 void des_fixup_key_parity();
 int des_check_key_parity();
-int des_key_sched();
-int des_new_random_key();
+KRB5_DLLIMP int KRB5_CALLCONV des_key_sched();
+KRB5_DLLIMP int KRB5_CALLCONV des_new_random_key();
 void des_init_random_number_generator();
-void des_set_random_generator_seed();
+KRB5_DLLIMP void KRB5_CALLCONV des_set_random_generator_seed();
 void des_set_sequence_number();
 void des_generate_random_block();
 int des_pcbc_encrypt();
diff --git a/src/lib/des425/key_sched.c b/src/lib/des425/key_sched.c
index d96ef6fe02..cb4ecee968 100644
--- a/src/lib/des425/key_sched.c
+++ b/src/lib/des425/key_sched.c
@@ -48,7 +48,7 @@
 #include <stdio.h>
 #include "des.h"
 
-int
+KRB5_DLLIMP int KRB5_CALLCONV
 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 b5a367b5a6..943b9e03b5 100644
--- a/src/lib/des425/new_rnd_key.c
+++ b/src/lib/des425/new_rnd_key.c
@@ -38,7 +38,7 @@ krb5_pointer des425_random_state = 0;
  *        to be a weak des key.  Des_generate_random_block is used to
  *        provide the random bits.
  */
-int
+KRB5_DLLIMP int KRB5_CALLCONV
 des_new_random_key(key)
     mit_des_cblock key;
 {
@@ -102,7 +102,7 @@ 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
+KRB5_DLLIMP void KRB5_CALLCONV
 des_set_random_generator_seed(key)
     mit_des_cblock key;
 {
diff --git a/src/lib/des425/pcbc_encrypt.c b/src/lib/des425/pcbc_encrypt.c
index 7c7517b232..92bc789a76 100644
--- a/src/lib/des425/pcbc_encrypt.c
+++ b/src/lib/des425/pcbc_encrypt.c
@@ -18,7 +18,7 @@
 /* 
  * copy of include/des.h to avoid collision with local one
  */
-#include "autoconf.h"
+#include "krb5.h"
 
 #ifndef KRB_INT32
 #if (SIZEOF_LONG == 4)
diff --git a/src/lib/des425/read_passwd.c b/src/lib/des425/read_passwd.c
index d9f29d72ea..968c986007 100644
--- a/src/lib/des425/read_passwd.c
+++ b/src/lib/des425/read_passwd.c
@@ -27,6 +27,8 @@
  * echoing.
  */
 
+#if defined(unix)
+
 #include "des.h"
 #include <stdio.h>
 #include <errno.h>
@@ -178,3 +180,8 @@ des_read_password/*_v4_compat_crock*/(k,prompt,verify)
     return ok;
 }
 
+#else /* !unix */
+/*
+ * These are all just dummy functions to make the rest of the library happy...
+ */
+#endif /* unix */
diff --git a/src/lib/des425/unix_time.c b/src/lib/des425/unix_time.c
index ed1110007a..ae7aee4c42 100644
--- a/src/lib/des425/unix_time.c
+++ b/src/lib/des425/unix_time.c
@@ -12,7 +12,7 @@
 
 #include "k5-int.h"
 
-#ifndef _MSDOS
+#if !defined(_MSDOS) && !defined(_WIN32)
 #include <sys/time.h>
 
 krb5_ui_4
@@ -27,8 +27,25 @@ unix_time_gmt_unixsec (usecptr)
 	return now.tv_sec;
 }
 
-#else /* _MSDOS */
+#endif /* !_MSDOS && !_WIN32 */
 
+#ifdef _WIN32
+#include <time.h>
+
+krb5_ui_4
+unix_time_gmt_unixsec (usecptr)
+    krb5_ui_4 *usecptr;
+{
+    time_t gmt;
+
+    time(&gmt);
+    if (usecptr)
+	*usecptr = gmt;
+    return gmt;
+}
+#endif /* _WIN32 */
+
+#ifdef MSDOS
 /*
  * Originally written by John Gilmore, Cygnus Support, May '94.
  * Public Domain.