summaryrefslogtreecommitdiffstats
path: root/src/lib/crypto/os
diff options
context:
space:
mode:
authorKeith Vetter <keithv@fusion.com>1995-03-03 02:20:21 +0000
committerKeith Vetter <keithv@fusion.com>1995-03-03 02:20:21 +0000
commit02a6367ca07d1d098a67121716cf02dfa0d7a0e2 (patch)
treef1d3fffae86d5d463a64f058aa8d8c4c74bc2722 /src/lib/crypto/os
parente61bc5292e6690d3e2e188016274758264351286 (diff)
downloadkrb5-02a6367ca07d1d098a67121716cf02dfa0d7a0e2.tar.gz
krb5-02a6367ca07d1d098a67121716cf02dfa0d7a0e2.tar.xz
krb5-02a6367ca07d1d098a67121716cf02dfa0d7a0e2.zip
Added the files and changes needed to create a dll out of libcrypto
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5068 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/os')
-rw-r--r--src/lib/crypto/os/ChangeLog6
-rw-r--r--src/lib/crypto/os/Makefile.in16
-rw-r--r--src/lib/crypto/os/rnd_confoun.c2
3 files changed, 15 insertions, 9 deletions
diff --git a/src/lib/crypto/os/ChangeLog b/src/lib/crypto/os/ChangeLog
index a2e96b464..9848d4be6 100644
--- a/src/lib/crypto/os/ChangeLog
+++ b/src/lib/crypto/os/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar 2 17:56:48 1995 Keith Vetter (keithv@fusion.com)
+
+ * Makefile.in: changed LIBNAME for the PC, and brought in ustime
+ and localaddr from the krb/os directory.
+ * rnd_conf.c: added cast to the seed assignment.
+
Mon Feb 20 16:25:36 1995 Keith Vetter (keithv@fusion.com)
* Makfile.in: made to work for the PC
diff --git a/src/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in
index 60e9af985..7bf4dd8e8 100644
--- a/src/lib/crypto/os/Makefile.in
+++ b/src/lib/crypto/os/Makefile.in
@@ -2,7 +2,7 @@ CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\libcrypto.$(LIBEXT)
+##DOSLIBNAME=..\crypto.lib
##DOS!include $(BUILDTOP)\config\windows.in
LIBOBJS = @LIBOBJS@
@@ -15,16 +15,16 @@ all:: all-$(WHAT)
all-unix:: $(OBJS)
-all-windows: rnd_confoun.obj
+all-windows: rnd_confoun.obj localaddr.obj ustime.obj
-localaddr.c: ../../krb5/os/localaddr.c
- -$(LN) $(srcdir)/../../krb5/os/localaddr.c $@
+localaddr.c: ..$(S)..$(S)krb5$(S)os$(S)localaddr.c
+ -$(LN) $(srcdir)$(S)..$(S)..$(S)krb5$(S)os$(S)localaddr.c $@
-ustime.c: ../../krb5/os/ustime.c
- -$(LN) $(srcdir)/../../krb5/os/ustime.c $@
+ustime.c: ..$(S)..$(S)krb5$(S)os$(S)ustime.c
+ -$(LN) $(srcdir)$(S)..$(S)..$(S)krb5$(S)os$(S)ustime.c $@
-memmove.c: ../../krb5/posix/memmove.c
- -$(LN) $(srcdir)/../../krb5/posix/memmove.c $@
+memmove.c: ..$(S)..$(S)krb5$(S)posix$(S)memmove.c
+ -$(LN) $(srcdir)$(S)..$(S)..$(S)krb5$(S)posix$(S)memmove.c $@
clean::
$(RM) ustime.c localaddr.c memmove.c
diff --git a/src/lib/crypto/os/rnd_confoun.c b/src/lib/crypto/os/rnd_confoun.c
index bed3b17ee..7021ec7d5 100644
--- a/src/lib/crypto/os/rnd_confoun.c
+++ b/src/lib/crypto/os/rnd_confoun.c
@@ -72,7 +72,7 @@ krb5_pointer fillin;
if (!seeded) {
/* time() defined in 4.12.2.4, but returns a time_t, which is an
"arithmetic type" (4.12.1) */
- rval = time(0);
+ rval = (RAND_TYPE) time(0);
SRAND(rval);
#ifdef HAVE_GETPID
rval = RAND();