[Opentnl-cvs] tnl/tnl asymmetricKey.cpp,1.1,1.2 bitStream.cpp,1.7,1.8 byteBuffer.cpp,1.3,1.4 clientP
Brought to you by:
mark_frohnmayer,
s_alanet
Update of /cvsroot/opentnl/tnl/tnl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29044/tnl Modified Files: asymmetricKey.cpp bitStream.cpp byteBuffer.cpp clientPuzzle.cpp netInterface.cpp random.cpp symmetricCipher.cpp tnl.vcproj tnlBitStream.h Log Message: Updated TNL to build with new libtomcrypt Added number in range checking on BitStream::readRangedU32 Index: random.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/tnl/random.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** random.cpp 14 Feb 2005 06:15:28 -0000 1.5 --- random.cpp 28 Apr 2005 17:30:30 -0000 1.6 *************** *** 26,30 **** ! #include <mycrypt.h> #include "tnl.h" #include "tnlRandom.h" --- 26,30 ---- ! #include "tomcrypt.h" #include "tnl.h" #include "tnlRandom.h" Index: byteBuffer.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/tnl/byteBuffer.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** byteBuffer.cpp 14 Feb 2005 06:15:25 -0000 1.3 --- byteBuffer.cpp 28 Apr 2005 17:30:30 -0000 1.4 *************** *** 26,30 **** #include "tnlByteBuffer.h" ! #include <mycrypt.h> namespace TNL { --- 26,30 ---- #include "tnlByteBuffer.h" ! #include "tomcrypt.h" namespace TNL { Index: asymmetricKey.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/tnl/asymmetricKey.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** asymmetricKey.cpp 20 Apr 2004 04:27:18 -0000 1.1 --- asymmetricKey.cpp 28 Apr 2005 17:30:30 -0000 1.2 *************** *** 27,31 **** #include "tnlAsymmetricKey.h" #include "tnlRandom.h" ! #include <mycrypt.h> #include "tnlLog.h" --- 27,31 ---- #include "tnlAsymmetricKey.h" #include "tnlRandom.h" ! #include "tomcrypt.h" #include "tnlLog.h" Index: netInterface.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/tnl/netInterface.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** netInterface.cpp 14 Feb 2005 06:15:28 -0000 1.9 --- netInterface.cpp 28 Apr 2005 17:30:30 -0000 1.10 *************** *** 34,38 **** #include "tnlClientPuzzle.h" #include "tnlCertificate.h" ! #include <mycrypt.h> namespace TNL { --- 34,38 ---- #include "tnlClientPuzzle.h" #include "tnlCertificate.h" ! #include "tomcrypt.h" namespace TNL { Index: clientPuzzle.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/tnl/clientPuzzle.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** clientPuzzle.cpp 23 Apr 2004 22:02:38 -0000 1.4 --- clientPuzzle.cpp 28 Apr 2005 17:30:30 -0000 1.5 *************** *** 29,33 **** #include "tnlRandom.h" ! #include <mycrypt.h> namespace TNL { --- 29,33 ---- #include "tnlRandom.h" ! #include "tomcrypt.h" namespace TNL { Index: bitStream.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/tnl/bitStream.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** bitStream.cpp 21 Feb 2005 07:48:13 -0000 1.7 --- bitStream.cpp 28 Apr 2005 17:30:30 -0000 1.8 *************** *** 30,34 **** #include "tnlHuffmanStringProcessor.h" #include "tnlSymmetricCipher.h" ! #include <mycrypt.h> #include <math.h> --- 30,34 ---- #include "tnlHuffmanStringProcessor.h" #include "tnlSymmetricCipher.h" ! #include "tomcrypt.h" #include <math.h> Index: tnl.vcproj =================================================================== RCS file: /cvsroot/opentnl/tnl/tnl/tnl.vcproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tnl.vcproj 14 Feb 2005 06:15:28 -0000 1.6 --- tnl.vcproj 28 Apr 2005 17:30:30 -0000 1.7 *************** *** 22,26 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="../libtomcrypt" PreprocessorDefinitions="TNL_DEBUG;TNL_ENABLE_LOGGING;WIN32;_DEBUG;_LIB;" BasicRuntimeChecks="3" --- 22,26 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="../libtomcrypt/headers" PreprocessorDefinitions="TNL_DEBUG;TNL_ENABLE_LOGGING;WIN32;_DEBUG;_LIB;" BasicRuntimeChecks="3" Index: tnlBitStream.h =================================================================== RCS file: /cvsroot/opentnl/tnl/tnl/tnlBitStream.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tnlBitStream.h 21 Feb 2005 07:48:14 -0000 1.7 --- tnlBitStream.h 28 Apr 2005 17:30:30 -0000 1.8 *************** *** 373,378 **** U32 rangeBits = getNextBinLog2(rangeSize); ! U32 val = U32(readInt(S32(rangeBits))); ! return val + rangeStart; } --- 373,384 ---- U32 rangeBits = getNextBinLog2(rangeSize); ! U32 val = U32(readInt(S32(rangeBits))) + rangeStart; ! if(val > rangeEnd) ! { ! TNLAssert(0, "Value out of range in readRangedU32"); ! error = true; ! return rangeStart; ! } ! return val; } Index: symmetricCipher.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/tnl/symmetricCipher.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** symmetricCipher.cpp 14 Feb 2005 06:15:28 -0000 1.2 --- symmetricCipher.cpp 28 Apr 2005 17:30:30 -0000 1.3 *************** *** 28,32 **** #include "tnlSymmetricCipher.h" #include "tnlByteBuffer.h" ! #include "mycrypt.h" namespace TNL { --- 28,32 ---- #include "tnlSymmetricCipher.h" #include "tnlByteBuffer.h" ! #include "tomcrypt.h" namespace TNL { |