From: Keith Vetter Date: Sat, 4 Mar 1995 04:14:07 +0000 (+0000) Subject: Finished off changed needed for making libcrypto.dll. Biggest change X-Git-Tag: krb5-1.0-beta5~596 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=44aaa95295259354b16f32359e0e26579bb9effe;p=krb5.git Finished off changed needed for making libcrypto.dll. Biggest change is that you can't pull in data from a DLL so had to add three routines that return the address of various data structures. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5074 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index 73b1a2925..615893364 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,9 @@ +Fri Mar 3 19:15:54 1995 Keith Vetter (keithv@fusion.com) + + * libcrypto.def: added 3 entry points for methods for pulling + in data from a DLL. + * Makefile.in: libcrypto.lib depends upon libcrypto.def + Thu Mar 2 17:43:25 1995 Keith Vetter (keithv@fusion.com) * Makefile.in: added rules to make a DLL from a lib. diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index fc632bde3..7f30190a5 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -30,7 +30,7 @@ win_glue.obj:: win_glue.c libcrypto.lib:: libcrypto.dll implib /nologo $@ $(@R).dll -libcrypto.dll:: $(LIBNAME) +libcrypto.dll:: $(LIBNAME) libcrypto.def link /co /noe /nologo win_glue,libcrypto.dll,nul,\ crypto.lib winsock ldllcew libw,libcrypto.def rc /p /k $@ @@ -63,19 +63,19 @@ check-unix:: all-windows:: cd crc32 @echo Making in ..\crc32 - -$(MAKE) -$(MFLAGS) + -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) cd ..\des @echo Making in des - -$(MAKE) -$(MFLAGS) + -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) cd ..\md4 @echo Making in ..\md4 - -$(MAKE) -$(MFLAGS) + -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) cd ..\md5 @echo Making in ..\md5 - -$(MAKE) -$(MFLAGS) + -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) cd ..\os @echo Making in ..\os - -$(MAKE) -$(MFLAGS) + -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) cd .. clean-windows:: diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog index 949a7c66e..f439d8e52 100644 --- a/src/lib/crypto/crc32/ChangeLog +++ b/src/lib/crypto/crc32/ChangeLog @@ -1,3 +1,8 @@ +Fri Mar 3 19:01:59 1995 Keith Vetter (keithv@fusion.com) + + * crc.c: added a method to pull in a data structure + from outside a dll. + Thu Mar 2 17:48:08 1995 Keith Vetter (keithv@fusion.com) * Makefile.in: changed LIBNAME for the PC diff --git a/src/lib/crypto/crc32/crc.c b/src/lib/crypto/crc32/crc.c index 6ee533a40..a6966630f 100644 --- a/src/lib/crypto/crc32/crc.c +++ b/src/lib/crypto/crc32/crc.c @@ -185,3 +185,15 @@ krb5_checksum_entry crc32_cksumtable_entry = { 0, /* not collision proof */ 0, /* doesn't use key */ }; + +#if defined(_WINDOWS) +/* +** Windows can't pull in data from a DLL library. So we must provide a +** method to do so. If the crypto library is merged in with the other +** libraries, and this never gets called by an end-user, then we +** can get rid of this. +*/ +krb5_checksum_entry * INTERFACE load_crc32_cksumtable_entry (void) { + return &crc32_cksumtable_entry; +} +#endif diff --git a/src/lib/crypto/libcrypt.def b/src/lib/crypto/libcrypt.def index ef3c85aaa..ca38a4eaa 100644 --- a/src/lib/crypto/libcrypt.def +++ b/src/lib/crypto/libcrypt.def @@ -1,8 +1,8 @@ ;----------------------------- -; CRYPTO.DEF - module definition file +; LIBCRYPTO.DEF - module definition file ;----------------------------- -LIBRARY CRYPTO +LIBRARY LIBCRYPT DESCRIPTION 'DLL for Kerberos cryptography support' EXETYPE WINDOWS CODE PRELOAD MOVEABLE DISCARDABLE @@ -10,7 +10,7 @@ DATA PRELOAD MOVEABLE SINGLE HEAPSIZE 8192 EXPORTS - WEP @1 RESIDENTNAME + WEP @1 RESIDENTNAME LIBMAIN @2 CRC32_SUM_FUNC @3 KRB5_RANDOM_CONFOUNDER @4 @@ -50,3 +50,6 @@ EXPORTS MIT_DES_STRING_TO_KEY @38 MIT_RAW_DES_DECRYPT_FUNC @39 MIT_RAW_DES_ENCRYPT_FUNC @40 + LOAD_CRC32_CKSUMTABLE_ENTRY @41 + LOAD_RSA_MD4_DES_CKSUMTABLE_ENTRY @42 + LOAD_RSA_MD5_DES_CKSUMTABLE_ENTRY @43 diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog index dca4ef84f..095530c73 100644 --- a/src/lib/crypto/md4/ChangeLog +++ b/src/lib/crypto/md4/ChangeLog @@ -1,3 +1,8 @@ +Fri Mar 3 19:01:59 1995 Keith Vetter (keithv@fusion.com) + + * md4crypto.c: added a method to pull in a data structure + from outside a dll. + Thu Mar 2 17:53:35 1995 Keith Vetter (keithv@fusion.com) * Makefile.in: changed LIBNAME for the PC diff --git a/src/lib/crypto/md4/md4crypto.c b/src/lib/crypto/md4/md4crypto.c index 38a3a4a3b..ecc524203 100644 --- a/src/lib/crypto/md4/md4crypto.c +++ b/src/lib/crypto/md4/md4crypto.c @@ -87,3 +87,15 @@ krb5_checksum_entry rsa_md4_des_cksumtable_entry = { 1, /* is collision proof */ 1, /* uses key */ }; + +#if defined(_WINDOWS) +/* +** Windows can't pull in data from a DLL library. So we must provide a +** method to do so. If the crypto library is merged in with the other +** libraries, and this never gets called by an end-user, then we +** can get rid of this. +*/ +krb5_checksum_entry * INTERFACE load_rsa_md4_des_cksumtable_entry (void) { + return &rsa_md4_des_cksumtable_entry; +} +#endif diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog index 3c93d5689..5b1e73973 100644 --- a/src/lib/crypto/md5/ChangeLog +++ b/src/lib/crypto/md5/ChangeLog @@ -1,3 +1,8 @@ +Fri Mar 3 19:01:59 1995 Keith Vetter (keithv@fusion.com) + + * md5crypto.c: added a method to pull in a data structure + from outside a dll. + Thu Mar 2 17:54:26 1995 Keith Vetter (keithv@fusion.com) * Makefile.in: changed LIBNAME for the PC diff --git a/src/lib/crypto/md5/md5crypto.c b/src/lib/crypto/md5/md5crypto.c index bb2fba504..c4276ab75 100644 --- a/src/lib/crypto/md5/md5crypto.c +++ b/src/lib/crypto/md5/md5crypto.c @@ -61,3 +61,15 @@ krb5_checksum_entry rsa_md5_des_cksumtable_entry = { 1, /* is collision proof */ 1, /* uses key */ }; + +#if defined(_WINDOWS) +/* +** Windows can't pull in data from a DLL library. So we must provide a +** method to do so. If the crypto library is merged in with the other +** libraries, and this never gets called by an end-user, then we +** can get rid of this. +*/ +krb5_checksum_entry * INTERFACE load_rsa_md5_des_cksumtable_entry (void) { + return &rsa_md5_des_cksumtable_entry; +} +#endif