diff options
| author | Richard Basch <probe@mit.edu> | 1997-02-06 02:21:18 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1997-02-06 02:21:18 +0000 |
| commit | a9266b1dec31de9f33b0d032b885edd377a23ee5 (patch) | |
| tree | bbf52d99bf23ea7e13da4a4c6b2a2f843c50b267 | |
| parent | 4cb92d0adf855de5082d0b7c7b5126619b9bec6a (diff) | |
| download | krb5-a9266b1dec31de9f33b0d032b885edd377a23ee5.tar.gz krb5-a9266b1dec31de9f33b0d032b885edd377a23ee5.tar.xz krb5-a9266b1dec31de9f33b0d032b885edd377a23ee5.zip | |
Windows/NT integration (V1_0_WIN32_BRANCH merge)
des3_sha.c: Confounder size should be 8, not 24
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9787 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/crypto/Makefile.in | 12 | ||||
| -rw-r--r-- | src/lib/crypto/des3_sha.c | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index 19243e6757..5dafc100c0 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -2,6 +2,9 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/crc32 -I$(srcdir)/des -I$(srcdir)/md4 -I$ ##DOSBUILDTOP = ..\.. ##DOSLIBNAME=crypto.lib +##DOSOBJFILE=crypto.lst +##DOSOBJFILELIST=@crypto.lst @des.lst @md4.lst @md5.lst @sha.lst @crc32.lst @os.lst +##DOSOBJFILEDEP =crypto.lst des.lst md4.lst md5.lst sha.lst crc32.lst os.lst MAC_SUBDIRS = des sha md4 md5 crc32 os @@ -47,8 +50,12 @@ shared: # FIXME, need to build the library too... all-mac:: $(OBJS) +all-windows:: $(OBJFILE) -all-windows:: $(OBJS) +##DOS$(OBJFILE): $(OBJS) +##DOS $(RM) $(OBJFILE) +##WIN16## $(CP) nul: $(OBJFILE) +##WIN32## $(LIBECHO) *.obj > $(OBJFILE) libcrypto.$(STEXT): $(LIBDONE) @if test -f $@ ; then \ @@ -66,7 +73,7 @@ clean-unix:: $(RM) libcrypto.a libcrypto.stamp shared/* clean-windows:: - $(RM) crypto.lib crypto.bak + $(RM) crypto.lib crypto.bak $(OBJFILE) check-unix:: @@ -83,7 +90,6 @@ all-windows:: cd ..\os @echo Making in crypto\os -$(MAKE) -$(MFLAGS) - rem BUG WITH NMAKE cd ..\md5 @echo Making in crypto\md5 -$(MAKE) -$(MFLAGS) diff --git a/src/lib/crypto/des3_sha.c b/src/lib/crypto/des3_sha.c index 96afa85d64..9b060e5899 100644 --- a/src/lib/crypto/des3_sha.c +++ b/src/lib/crypto/des3_sha.c @@ -27,7 +27,7 @@ #include "des_int.h" -#define DES3_SHA_CONFOUNDER_SIZE sizeof(mit_des3_cblock) +#define DES3_SHA_CONFOUNDER_SIZE sizeof(mit_des_cblock) static krb5_error_code mit_des3_sha_encrypt_func @@ -83,7 +83,7 @@ mit_des3_sha_encrypt_func(in, out, size, key, ivec) |confounder | check | msg-seq | pad | +-----------+----------+-------------+-----+ - our confounder is 24 bytes + our confounder is 8 bytes our checksum is NIST_SHA_CKSUM_LENGTH */ sumsize = krb5_roundup(size + mit_des3_sha_cryptosystem_entry.pad_minimum, |