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

diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 19243e6757b1ecdfd1abb3a4eba3920364b69992..5dafc100c00cfd00b3dc5507e6b83fac929dd242 100644 (file)
--- 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 96afa85d6464feaf2e69b9f20d3f537fdb809380..9b060e58998168a4149a5bfb15af498f24a17a7f 100644 (file)
--- 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,