[Yassl-commit] yassl/taocrypt/src md4.cpp,NONE,1.1 Makefile.am,1.1.1.1,1.2 Makefile.in,1.1.1.1,1.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/yassl/yassl/taocrypt/src
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv320/taocrypt/src

Modified Files:
	Makefile.am Makefile.in 
Added Files:
	md4.cpp 
Log Message:
add md4 support to TaoCrypt so yaSSL can support libcurl NTLM authentication

Index: Makefile.in
===================================================================
RCS file: /cvsroot/yassl/yassl/taocrypt/src/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.in	28 Mar 2006 23:56:35 -0000	1.1.1.1
--- Makefile.in	15 May 2006 22:17:55 -0000	1.2
***************
*** 136,141 ****
  libtaocrypt_a_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \
  	bftables.cpp blowfish.cpp coding.cpp dh.cpp des.cpp dsa.cpp file.cpp \
!     hash.cpp integer.cpp md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp \
!     rsa.cpp sha.cpp template_instnt.cpp tftables.cpp twofish.cpp
  
  AM_CXXFLAGS = -Wall -Wno-return-type -Wno-unused
--- 136,141 ----
  libtaocrypt_a_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \
  	bftables.cpp blowfish.cpp coding.cpp dh.cpp des.cpp dsa.cpp file.cpp \
!     hash.cpp integer.cpp md2.cpp md4.cpp md5.cpp misc.cpp random.cpp \
!     ripemd.cpp rsa.cpp sha.cpp template_instnt.cpp tftables.cpp twofish.cpp
  
  AM_CXXFLAGS = -Wall -Wno-return-type -Wno-unused
***************
*** 154,161 ****
  	bftables.$(OBJEXT) blowfish.$(OBJEXT) coding.$(OBJEXT) \
  	dh.$(OBJEXT) des.$(OBJEXT) dsa.$(OBJEXT) file.$(OBJEXT) \
! 	hash.$(OBJEXT) integer.$(OBJEXT) md2.$(OBJEXT) md5.$(OBJEXT) \
! 	misc.$(OBJEXT) random.$(OBJEXT) ripemd.$(OBJEXT) rsa.$(OBJEXT) \
! 	sha.$(OBJEXT) template_instnt.$(OBJEXT) tftables.$(OBJEXT) \
! 	twofish.$(OBJEXT)
  libtaocrypt_a_OBJECTS = $(am_libtaocrypt_a_OBJECTS)
  
--- 154,161 ----
  	bftables.$(OBJEXT) blowfish.$(OBJEXT) coding.$(OBJEXT) \
  	dh.$(OBJEXT) des.$(OBJEXT) dsa.$(OBJEXT) file.$(OBJEXT) \
! 	hash.$(OBJEXT) integer.$(OBJEXT) md2.$(OBJEXT) md4.$(OBJEXT) \
! 	md5.$(OBJEXT) misc.$(OBJEXT) random.$(OBJEXT) ripemd.$(OBJEXT) \
! 	rsa.$(OBJEXT) sha.$(OBJEXT) template_instnt.$(OBJEXT) \
! 	tftables.$(OBJEXT) twofish.$(OBJEXT)
  libtaocrypt_a_OBJECTS = $(am_libtaocrypt_a_OBJECTS)
  
***************
*** 170,177 ****
  @AMDEP_TRUE@	./$(DEPDIR)/dsa.Po ./$(DEPDIR)/file.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/hash.Po ./$(DEPDIR)/integer.Po \
! @AMDEP_TRUE@	./$(DEPDIR)/md2.Po ./$(DEPDIR)/md5.Po \
! @AMDEP_TRUE@	./$(DEPDIR)/misc.Po ./$(DEPDIR)/random.Po \
! @AMDEP_TRUE@	./$(DEPDIR)/ripemd.Po ./$(DEPDIR)/rsa.Po \
! @AMDEP_TRUE@	./$(DEPDIR)/sha.Po ./$(DEPDIR)/template_instnt.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/tftables.Po ./$(DEPDIR)/twofish.Po
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--- 170,178 ----
  @AMDEP_TRUE@	./$(DEPDIR)/dsa.Po ./$(DEPDIR)/file.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/hash.Po ./$(DEPDIR)/integer.Po \
! @AMDEP_TRUE@	./$(DEPDIR)/md2.Po ./$(DEPDIR)/md4.Po \
! @AMDEP_TRUE@	./$(DEPDIR)/md5.Po ./$(DEPDIR)/misc.Po \
! @AMDEP_TRUE@	./$(DEPDIR)/random.Po ./$(DEPDIR)/ripemd.Po \
! @AMDEP_TRUE@	./$(DEPDIR)/rsa.Po ./$(DEPDIR)/sha.Po \
! @AMDEP_TRUE@	./$(DEPDIR)/template_instnt.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/tftables.Po ./$(DEPDIR)/twofish.Po
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
***************
*** 251,254 ****
--- 252,256 ----
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/integer.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md4.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@

Index: Makefile.am
===================================================================
RCS file: /cvsroot/yassl/yassl/taocrypt/src/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	28 Mar 2006 23:56:35 -0000	1.1.1.1
--- Makefile.am	15 May 2006 22:17:55 -0000	1.2
***************
*** 4,9 ****
  libtaocrypt_a_SOURCES  = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \
  	bftables.cpp blowfish.cpp coding.cpp dh.cpp des.cpp dsa.cpp file.cpp \
!     hash.cpp integer.cpp md2.cpp md5.cpp misc.cpp random.cpp ripemd.cpp \
!     rsa.cpp sha.cpp template_instnt.cpp tftables.cpp twofish.cpp
  AM_CXXFLAGS = -Wall -Wno-return-type -Wno-unused
  EXTRA_DIST = ../include/*.hpp ../test/memory.cpp make.bat
--- 4,9 ----
  libtaocrypt_a_SOURCES  = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \
  	bftables.cpp blowfish.cpp coding.cpp dh.cpp des.cpp dsa.cpp file.cpp \
!     hash.cpp integer.cpp md2.cpp md4.cpp md5.cpp misc.cpp random.cpp \
!     ripemd.cpp rsa.cpp sha.cpp template_instnt.cpp tftables.cpp twofish.cpp
  AM_CXXFLAGS = -Wall -Wno-return-type -Wno-unused
  EXTRA_DIST = ../include/*.hpp ../test/memory.cpp make.bat

--- NEW FILE: md4.cpp ---
/* md4.cpp                                
 *
 * Copyright (C) 2003 Sawtooth Consulting Ltd.
 *
 * This file is part of yaSSL.
 *
 * yaSSL is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * yaSSL is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */


/* based on Wei Dai's md4.cpp from CryptoPP */

#include "runtime.hpp"
#include "md4.hpp"
#include "algorithm.hpp"    // mySTL::swap

   
namespace TaoCrypt {

void MD4::Init()
{
    digest_[0] = 0x67452301L;
    digest_[1] = 0xefcdab89L;
    digest_[2] = 0x98badcfeL;
    digest_[3] = 0x10325476L;

    buffLen_ = 0;
    loLen_  = 0;
    hiLen_  = 0;
}


MD4::MD4(const MD4& that) : HASHwithTransform(DIGEST_SIZE / sizeof(word32),
                                              BLOCK_SIZE) 
{ 
    buffLen_ = that.buffLen_;
    loLen_  =  that.loLen_;
    hiLen_  =  that.hiLen_;

    memcpy(digest_, that.digest_, DIGEST_SIZE);
    memcpy(buffer_, that.buffer_, BLOCK_SIZE);
}

MD4& MD4::operator= (const MD4& that)
{
    MD4 tmp(that);
    Swap(tmp);

    return *this;
}


void MD4::Swap(MD4& other)
{
    mySTL::swap(loLen_,   other.loLen_);
    mySTL::swap(hiLen_,   other.hiLen_);
    mySTL::swap(buffLen_, other.buffLen_);

    memcpy(digest_, other.digest_, DIGEST_SIZE);
    memcpy(buffer_, other.buffer_, BLOCK_SIZE);
}


void MD4::Transform()
{
#define F(x, y, z) ((z) ^ ((x) & ((y) ^ (z))))
#define G(x, y, z) (((x) & (y)) | ((x) & (z)) | ((y) & (z)))
#define H(x, y, z) ((x) ^ (y) ^ (z))

    word32 A, B, C, D;

    A = digest_[0];
    B = digest_[1];
    C = digest_[2];
    D = digest_[3];

#define function(a,b,c,d,k,s) a=rotlFixed(a+F(b,c,d)+buffer_[k],s);
    function(A,B,C,D, 0, 3);
    function(D,A,B,C, 1, 7);
    function(C,D,A,B, 2,11);
    function(B,C,D,A, 3,19);
    function(A,B,C,D, 4, 3);
    function(D,A,B,C, 5, 7);
    function(C,D,A,B, 6,11);
    function(B,C,D,A, 7,19);
    function(A,B,C,D, 8, 3);
    function(D,A,B,C, 9, 7);
    function(C,D,A,B,10,11);
    function(B,C,D,A,11,19);
    function(A,B,C,D,12, 3);
    function(D,A,B,C,13, 7);
    function(C,D,A,B,14,11);
    function(B,C,D,A,15,19);

#undef function	  
#define function(a,b,c,d,k,s) a=rotlFixed(a+G(b,c,d)+buffer_[k]+0x5a827999,s);
    function(A,B,C,D, 0, 3);
    function(D,A,B,C, 4, 5);
    function(C,D,A,B, 8, 9);
    function(B,C,D,A,12,13);
    function(A,B,C,D, 1, 3);
    function(D,A,B,C, 5, 5);
    function(C,D,A,B, 9, 9);
    function(B,C,D,A,13,13);
    function(A,B,C,D, 2, 3);
    function(D,A,B,C, 6, 5);
    function(C,D,A,B,10, 9);
    function(B,C,D,A,14,13);
    function(A,B,C,D, 3, 3);
    function(D,A,B,C, 7, 5);
    function(C,D,A,B,11, 9);
    function(B,C,D,A,15,13);

#undef function	 
#define function(a,b,c,d,k,s) a=rotlFixed(a+H(b,c,d)+buffer_[k]+0x6ed9eba1,s);
    function(A,B,C,D, 0, 3);
    function(D,A,B,C, 8, 9);
    function(C,D,A,B, 4,11);
    function(B,C,D,A,12,15);
    function(A,B,C,D, 2, 3);
    function(D,A,B,C,10, 9);
    function(C,D,A,B, 6,11);
    function(B,C,D,A,14,15);
    function(A,B,C,D, 1, 3);
    function(D,A,B,C, 9, 9);
    function(C,D,A,B, 5,11);
    function(B,C,D,A,13,15);
    function(A,B,C,D, 3, 3);
    function(D,A,B,C,11, 9);
    function(C,D,A,B, 7,11);
    function(B,C,D,A,15,15);

    digest_[0] += A;
    digest_[1] += B;
    digest_[2] += C;
    digest_[3] += D;
}


} // namespace