arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added "make coverage" recipe. Added additional SecBlock tests

pull/95/head
Jeffrey Walton 2015-12-28 07:06:50 -05:00
parent 605744d826
commit 13748582e5
3 changed files with 234 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
GNUmakefile
View File

@ -231,7 +231,14 @@ endif # Gold
ifneq ($(filter align aligned,$(MAKECMDGOALS)),) ifneq ($(filter align aligned,$(MAKECMDGOALS)),)
ifeq ($(findstring -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS,$(CXXFLAGS)),) ifeq ($(findstring -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS,$(CXXFLAGS)),)
CXXFLAGS += -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS CXXFLAGS += -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS
endif # # CXXFLAGS endif # CXXFLAGS
endif # Aligned access
# GCC code coverage
ifneq ($(filter coverage,$(MAKECMDGOALS)),)
ifeq ($(findstring -coverage,$(CXXFLAGS)),)
CXXFLAGS += -coverage
endif # -ftest-coverage
endif # Aligned access endif # Aligned access
# Debug testing on GNU systems # Debug testing on GNU systems
@ -313,6 +320,16 @@ deps GNUmakefile.deps:
.PHONY: asan ubsan align aligned .PHONY: asan ubsan align aligned
asan ubsan align aligned: libcryptopp.a cryptest.exe asan ubsan align aligned: libcryptopp.a cryptest.exe
# export CXXFLAGS="-g3 -O1"
.PHONY: coverage
coverage: libcryptopp.a cryptest.exe
lcov --base-directory . --directory . --zerocounters -q
./cryptest.exe v
lcov --base-directory . --directory . -c -o cryptest.info
lcov --remove cryptest.info "/usr/*" -o cryptest.info
rm -rf ./TestCoverage/
genhtml -o ./TestCoverage/ -t "cryptest.exe test coverage" --num-spaces 4 cryptest.info
.PHONY: test check .PHONY: test check
test check: cryptest.exe test check: cryptest.exe
./cryptest.exe v ./cryptest.exe v
@ -350,14 +367,18 @@ clean:
ifeq ($(HAS_SOLIB_VERSION),1) ifeq ($(HAS_SOLIB_VERSION),1)
-$(RM) libcryptopp.so libcryptopp.so$(SOLIB_COMPAT_SUFFIX) -$(RM) libcryptopp.so libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
endif endif
-$(RM) adhoc.cpp.o adhoc.cpp.proto.o $(LIBOBJS) $(TESTOBJS) $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS) *.stackdump core-* -$(RM) adhoc.cpp.o adhoc.cpp.proto.o $(LIBOBJS) $(TESTOBJS) $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS)
-$(RM) cryptest.exe dlltest.exe cryptest.import.exe ct rdrand-???.o -$(RM) cryptest.exe dlltest.exe cryptest.import.exe ct rdrand-???.o
-$(RM) *.gcno *.gcda *.stackdump core-*
ifneq ($(wildcard *.exe.dSYM),) ifneq ($(wildcard *.exe.dSYM),)
-$(RM) -r *.exe.dSYM/ -$(RM) -r *.exe.dSYM/
endif endif
ifneq ($(wildcard $(DOCUMENT_DIRECTORY)/),) ifneq ($(wildcard $(DOCUMENT_DIRECTORY)/),)
-$(RM) -r $(DOCUMENT_DIRECTORY)/ -$(RM) -r $(DOCUMENT_DIRECTORY)/
endif endif
ifneq ($(wildcard TestCoverage/),)
-$(RM) -r TestCoverage/
endif
ifneq ($(wildcard cov-int/),) ifneq ($(wildcard cov-int/),)
-$(RM) -r cov-int/ -$(RM) -r cov-int/
endif endif
@ -366,7 +387,7 @@ endif
distclean: clean distclean: clean
-$(RM) adhoc.cpp adhoc.cpp.copied GNUmakefile.deps benchmarks.html cryptest.txt cryptest-*.txt -$(RM) adhoc.cpp adhoc.cpp.copied GNUmakefile.deps benchmarks.html cryptest.txt cryptest-*.txt
-$(RM) CMakeCache.txt Makefile CTestTestfile.cmake cmake_install.cmake cryptopp-config-version.cmake -$(RM) CMakeCache.txt Makefile CTestTestfile.cmake cmake_install.cmake cryptopp-config-version.cmake
-$(RM) *.o *.ii *.s *~ -$(RM) *.o *.ii *.s *~
ifneq ($(wildcard CMakeFiles/),) ifneq ($(wildcard CMakeFiles/),)
-$(RM) -r CMakeFiles/ -$(RM) -r CMakeFiles/
endif endif
@ -448,7 +469,8 @@ libcryptopp.dylib: $(LIBOBJS)
cryptest.exe: public_service | libcryptopp.a $(TESTOBJS) cryptest.exe: public_service | libcryptopp.a $(TESTOBJS)
$(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(GOLD_OPTION) $(LDLIBS) $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(GOLD_OPTION) $(LDLIBS)
nolib: $(OBJS) # makes it faster to test changes # Makes it faster to test changes
nolib: $(OBJS)
$(CXX) -o ct $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LDLIBS) $(CXX) -o ct $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LDLIBS)
dll: cryptest.import.exe dlltest.exe dll: cryptest.import.exe dlltest.exe
@ -513,7 +535,7 @@ bench benchmark benchmarks: cryptest.exe
echo "<TITLE>Speed Comparison of Popular Crypto Algorithms</TITLE>" >> benchmarks.html echo "<TITLE>Speed Comparison of Popular Crypto Algorithms</TITLE>" >> benchmarks.html
echo "</HEAD>" >> benchmarks.html echo "</HEAD>" >> benchmarks.html
echo "<BODY>" >> benchmarks.html echo "<BODY>" >> benchmarks.html
echo "<H1><a href=\"http://www.cryptopp.com\">Crypto++</a>" $(LIB_MAJOR).$(LIB_MINOR).$(LIB_REVISION) "Benchmarks</H1>" >> benchmarks.html echo "<H1><a href=\"http://www.cryptopp.com\">Crypto++</a>" $(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH) "Benchmarks</H1>" >> benchmarks.html
echo "<P>Here are speed benchmarks for some commonly used cryptographic algorithms.</P>" >> benchmarks.html echo "<P>Here are speed benchmarks for some commonly used cryptographic algorithms.</P>" >> benchmarks.html
./cryptest.exe b 3 2.4 >> benchmarks.html ./cryptest.exe b 3 2.4 >> benchmarks.html
echo "</BODY>" >> benchmarks.html echo "</BODY>" >> benchmarks.html

5
secblock.h
View File

@ -253,6 +253,7 @@ template <class T>
class NullAllocator : public AllocatorBase<T> class NullAllocator : public AllocatorBase<T>
{ {
public: public:
//LCOV_EXCL_START
CRYPTOPP_INHERIT_ALLOCATOR_TYPES CRYPTOPP_INHERIT_ALLOCATOR_TYPES
// TODO: should this return NULL or throw bad_alloc? Non-Windows C++ standard // TODO: should this return NULL or throw bad_alloc? Non-Windows C++ standard
@ -271,6 +272,7 @@ public:
} }
size_type max_size() const {return 0;} size_type max_size() const {return 0;}
//LCOV_EXCL_STOP
}; };
//! \class FixedSizeAllocatorWithCleanup //! \class FixedSizeAllocatorWithCleanup
@ -611,7 +613,8 @@ public:
//! \sa operator!=() //! \sa operator!=()
bool operator==(const SecBlock<T, A> &t) const bool operator==(const SecBlock<T, A> &t) const
{ {
return m_size == t.m_size && VerifyBufsEqual(m_ptr, t.m_ptr, m_size*sizeof(T)); return m_size == t.m_size &&
VerifyBufsEqual(reinterpret_cast<const byte*>(m_ptr), reinterpret_cast<const byte*>(t.m_ptr), m_size*sizeof(T));
} }
//! \brief Bitwise compare two SecBlocks //! \brief Bitwise compare two SecBlocks

270
validat1.cpp
View File

@ -303,38 +303,39 @@ bool TestSettings()
#if !defined(NDEBUG) && !defined(CRYPTOPP_IMPORTS) #if !defined(NDEBUG) && !defined(CRYPTOPP_IMPORTS)
bool TestSecBlock() bool TestSecBlock()
{ {
// SecBlock Assign, append and concatenate are not exercised in the library.
cout << "\nTesting SecBlock...\n\n"; cout << "\nTesting SecBlock...\n\n";
bool r1 = true, r2 = true, r3 = true;
bool r4 = true, r5 = true, r6 = true;
//********************** Assign bool result = true, temp = true;
//********** Assign **********//
try try
{ {
temp = true;
SecByteBlock a, b; SecByteBlock a, b;
a.Assign((const byte*)"a", 1); a.Assign((const byte*)"a", 1);
b.Assign((const byte*)"b", 1); b.Assign((const byte*)"b", 1);
r1 &= (a.SizeInBytes() == 1); temp &= (a.SizeInBytes() == 1);
r1 &= (b.SizeInBytes() == 1); temp &= (b.SizeInBytes() == 1);
r1 &= (a[0] == 'a'); temp &= (a[0] == 'a');
r1 &= (b[0] == 'b'); temp &= (b[0] == 'b');
a.Assign((const byte*)"ab", 2); a.Assign((const byte*)"ab", 2);
b.Assign((const byte*)"cd", 2); b.Assign((const byte*)"cd", 2);
r1 &= (a.SizeInBytes() == 2); temp &= (a.SizeInBytes() == 2);
r1 &= (b.SizeInBytes() == 2); temp &= (b.SizeInBytes() == 2);
r1 &= (a[0] == 'a' && a[1] == 'b'); temp &= (a[0] == 'a' && a[1] == 'b');
r1 &= (b[0] == 'c' && b[1] == 'd'); temp &= (b[0] == 'c' && b[1] == 'd');
} }
catch(const Exception& ex) catch(const Exception& ex)
{ {
r1 = false; temp = false;
} }
if (!r1) result &= temp;
if (!temp)
cout << "FAILED:"; cout << "FAILED:";
else else
cout << "passed:"; cout << "passed:";
@ -342,75 +343,79 @@ bool TestSecBlock()
try try
{ {
temp = true;
SecBlock<word32> a, b; SecBlock<word32> a, b;
word32 one[1] = {1}, two[1] = {2}; word32 one[1] = {1}, two[1] = {2};
a.Assign(one, 1); a.Assign(one, 1);
b.Assign(two, 1); b.Assign(two, 1);
r2 &= (a.SizeInBytes() == 4); temp &= (a.SizeInBytes() == 4);
r2 &= (b.SizeInBytes() == 4); temp &= (b.SizeInBytes() == 4);
r2 &= (a[0] == 1); temp &= (a[0] == 1);
r2 &= (b[0] == 2); temp &= (b[0] == 2);
word32 three[2] = {1,2}, four[2] = {3,4}; word32 three[2] = {1,2}, four[2] = {3,4};
a.Assign(three, 2); a.Assign(three, 2);
b.Assign(four, 2); b.Assign(four, 2);
r2 &= (a.SizeInBytes() == 8); temp &= (a.SizeInBytes() == 8);
r2 &= (b.SizeInBytes() == 8); temp &= (b.SizeInBytes() == 8);
r2 &= (a[0] == 1 && a[1] == 2); temp &= (a[0] == 1 && a[1] == 2);
r2 &= (b[0] == 3 && b[1] == 4); temp &= (b[0] == 3 && b[1] == 4);
} }
catch(const Exception& ex) catch(const Exception& ex)
{ {
r2 = false; temp = false;
} }
if (!r2) result &= temp;
if (!temp)
cout << "FAILED:"; cout << "FAILED:";
else else
cout << "passed:"; cout << "passed:";
cout << " Assign word32" << endl; cout << " Assign word32" << endl;
//********************** Append //********** Append **********//
try try
{ {
temp = true;
SecByteBlock a, b; SecByteBlock a, b;
a.Assign((const byte*)"a", 1); a.Assign((const byte*)"a", 1);
b.Assign((const byte*)"b", 1); b.Assign((const byte*)"b", 1);
a += b; a += b;
r3 &= (a.SizeInBytes() == 2); temp &= (a.SizeInBytes() == 2);
r3 &= (a[0] == 'a' && a[1] == 'b'); temp &= (a[0] == 'a' && a[1] == 'b');
a.Assign((const byte*)"ab", 2); a.Assign((const byte*)"ab", 2);
b.Assign((const byte*)"cd", 2); b.Assign((const byte*)"cd", 2);
a += b; a += b;
r3 &= (a.SizeInBytes() == 4); temp &= (a.SizeInBytes() == 4);
r3 &= (a[0] == 'a' && a[1] == 'b' && a[2] == 'c' && a[3] == 'd'); temp &= (a[0] == 'a' && a[1] == 'b' && a[2] == 'c' && a[3] == 'd');
a.Assign((const byte*)"a", 1); a.Assign((const byte*)"a", 1);
a += a; a += a;
r3 &= (a.SizeInBytes() == 2); temp &= (a.SizeInBytes() == 2);
r3 &= (a[0] == 'a' && a[1] == 'a'); temp &= (a[0] == 'a' && a[1] == 'a');
a.Assign((const byte*)"ab", 2); a.Assign((const byte*)"ab", 2);
a += a; a += a;
r3 &= (a.SizeInBytes() == 4); temp &= (a.SizeInBytes() == 4);
r3 &= (a[0] == 'a' && a[1] == 'b' && a[2] == 'a' && a[3] == 'b'); temp &= (a[0] == 'a' && a[1] == 'b' && a[2] == 'a' && a[3] == 'b');
} }
catch(const Exception& ex) catch(const Exception& ex)
{ {
r3 = false; temp = false;
} }
if (!r3) result &= temp;
if (!temp)
cout << "FAILED:"; cout << "FAILED:";
else else
cout << "passed:"; cout << "passed:";
@ -418,6 +423,7 @@ bool TestSecBlock()
try try
{ {
temp = true;
SecBlock<word32> a, b; SecBlock<word32> a, b;
word32 one[1] = {1}, two[1] = {2}; word32 one[1] = {1}, two[1] = {2};
@ -425,8 +431,8 @@ bool TestSecBlock()
b.Assign(two, 1); b.Assign(two, 1);
a += b; a += b;
r4 &= (a.SizeInBytes() == 8); temp &= (a.SizeInBytes() == 8);
r4 &= (a[0] == 1 && a[1] == 2); temp &= (a[0] == 1 && a[1] == 2);
word32 three[2] = {1,2}, four[2] = {3,4}; word32 three[2] = {1,2}, four[2] = {3,4};
@ -434,62 +440,65 @@ bool TestSecBlock()
b.Assign(four, 2); b.Assign(four, 2);
a += b; a += b;
r4 &= (a.SizeInBytes() == 16); temp &= (a.SizeInBytes() == 16);
r4 &= (a[0] == 1 && a[1] == 2 && a[2] == 3 && a[3] == 4); temp &= (a[0] == 1 && a[1] == 2 && a[2] == 3 && a[3] == 4);
a.Assign(one, 1); a.Assign(one, 1);
a += a; a += a;
r4 &= (a.SizeInBytes() == 8); temp &= (a.SizeInBytes() == 8);
r4 &= (a[0] == 1 && a[1] == 1); temp &= (a[0] == 1 && a[1] == 1);
a.Assign(three, 2); a.Assign(three, 2);
a += a; a += a;
r4 &= (a.SizeInBytes() == 16); temp &= (a.SizeInBytes() == 16);
r4 &= (a[0] == 1 && a[1] == 2 && a[2] == 1 && a[3] == 2); temp &= (a[0] == 1 && a[1] == 2 && a[2] == 1 && a[3] == 2);
} }
catch(const Exception& ex) catch(const Exception& ex)
{ {
r2 = false; temp = false;
} }
if (!r4) result &= temp;
if (!temp)
cout << "FAILED:"; cout << "FAILED:";
else else
cout << "passed:"; cout << "passed:";
cout << " Append word32" << endl; cout << " Append word32" << endl;
//********************** Concatenate //********** Append **********//
try try
{ {
temp = true;
SecByteBlock a, b, c; SecByteBlock a, b, c;
a.Assign((const byte*)"a", 1); a.Assign((const byte*)"a", 1);
b.Assign((const byte*)"b", 1); b.Assign((const byte*)"b", 1);
c = a + b; c = a + b;
r5 &= (a[0] == 'a'); temp &= (a[0] == 'a');
r5 &= (b[0] == 'b'); temp &= (b[0] == 'b');
r5 &= (c.SizeInBytes() == 2); temp &= (c.SizeInBytes() == 2);
r5 &= (c[0] == 'a' && c[1] == 'b'); temp &= (c[0] == 'a' && c[1] == 'b');
a.Assign((const byte*)"ab", 2); a.Assign((const byte*)"ab", 2);
b.Assign((const byte*)"cd", 2); b.Assign((const byte*)"cd", 2);
c = a + b; c = a + b;
r5 &= (a[0] == 'a' && a[1] == 'b'); temp &= (a[0] == 'a' && a[1] == 'b');
r5 &= (b[0] == 'c' && b[1] == 'd'); temp &= (b[0] == 'c' && b[1] == 'd');
r5 &= (c.SizeInBytes() == 4); temp &= (c.SizeInBytes() == 4);
r5 &= (c[0] == 'a' && c[1] == 'b' && c[2] == 'c' && c[3] == 'd'); temp &= (c[0] == 'a' && c[1] == 'b' && c[2] == 'c' && c[3] == 'd');
} }
catch(const Exception& ex) catch(const Exception& ex)
{ {
r5 = false; temp = false;
} }
if (!r5) result &= temp;
if (!temp)
cout << "FAILED:"; cout << "FAILED:";
else else
cout << "passed:"; cout << "passed:";
@ -497,6 +506,7 @@ bool TestSecBlock()
try try
{ {
temp = true;
SecBlock<word32> a, b, c; SecBlock<word32> a, b, c;
word32 one[1] = {1}, two[1] = {2}; word32 one[1] = {1}, two[1] = {2};
@ -504,10 +514,10 @@ bool TestSecBlock()
b.Assign(two, 1); b.Assign(two, 1);
c = a + b; c = a + b;
r6 &= (a[0] == 1); temp &= (a[0] == 1);
r6 &= (b[0] == 2); temp &= (b[0] == 2);
r6 &= (c.SizeInBytes() == 8); temp &= (c.SizeInBytes() == 8);
r6 &= (c[0] == 1 && c[1] == 2); temp &= (c[0] == 1 && c[1] == 2);
word32 three[2] = {1,2}, four[2] = {3,4}; word32 three[2] = {1,2}, four[2] = {3,4};
@ -515,24 +525,150 @@ bool TestSecBlock()
b.Assign(four, 2); b.Assign(four, 2);
c = a + b; c = a + b;
r6 &= (a[0] == 1 && a[1] == 2); temp &= (a[0] == 1 && a[1] == 2);
r6 &= (b[0] == 3 && b[1] == 4); temp &= (b[0] == 3 && b[1] == 4);
r6 &= (c.SizeInBytes() == 16); temp &= (c.SizeInBytes() == 16);
r6 &= (c[0] == 1 && c[1] == 2 && c[2] == 3 && c[3] == 4); temp &= (c[0] == 1 && c[1] == 2 && c[2] == 3 && c[3] == 4);
} }
catch(const Exception& ex) catch(const Exception& ex)
{ {
r6 = false; temp = false;
} }
if (!r6) result &= temp;
if (!temp)
cout << "FAILED:"; cout << "FAILED:";
else else
cout << "passed:"; cout << "passed:";
cout << " Concatenate word32" << endl; cout << " Concatenate word32" << endl;
//********** Equality **********//
return r1 && r2 && r3 && r4 && r5 && r6; try
{
static const byte str1[] = "abcdefghijklmnopqrstuvwxyz";
static const byte str2[] = "zyxwvutsrqponmlkjihgfedcba";
static const byte str3[] = "0123456789";
temp = true;
SecByteBlock a,b;
a.Assign(str1, COUNTOF(str1));
b.Assign(str1, COUNTOF(str1));
temp &= (a == b);
a.Assign(str3, COUNTOF(str3));
b.Assign(str3, COUNTOF(str3));
temp &= (a == b);
a.Assign(str1, COUNTOF(str1));
b.Assign(str2, COUNTOF(str2));
temp &= (a.operator!=(b));
a.Assign(str1, COUNTOF(str1));
b.Assign(str3, COUNTOF(str3));
temp &= (a != b);
}
catch(const Exception& ex)
{
temp = false;
}
result &= temp;
if (!temp)
cout << "FAILED:";
else
cout << "passed:";
cout << " Equality byte" << endl;
try
{
static const word32 str1[] = {2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73,79,83,89,97};
static const word32 str2[] = {97,89,83,79,73,71,67,61,59,53,47,43,41,37,31,29,23,19,17,13,11,7,5,3,2};
static const word32 str3[] = {0,1,2,3,4,5,6,7,8,9};
temp = true;
SecBlock<word32> a,b;
a.Assign(str1, COUNTOF(str1));
b.Assign(str1, COUNTOF(str1));
temp &= (a == b);
a.Assign(str3, COUNTOF(str3));
b.Assign(str3, COUNTOF(str3));
temp &= (a == b);
a.Assign(str1, COUNTOF(str1));
b.Assign(str2, COUNTOF(str2));
temp &= (a.operator!=(b));
a.Assign(str1, COUNTOF(str1));
b.Assign(str3, COUNTOF(str3));
temp &= (a != b);
}
catch(const Exception& ex)
{
temp = false;
}
result &= temp;
if (!temp)
cout << "FAILED:";
else
cout << "passed:";
cout << " Equality word32" << endl;
//********** Size/Overflow **********//
try
{
temp = false;
AllocatorBase<word32> A;
const size_t max = A.max_size();
SecBlock<word32> t(max+1);
}
catch(const Exception& ex)
{
temp = true;
}
catch(const std::exception& ex)
{
temp = true;
}
result &= temp;
if (!temp)
cout << "FAILED:";
else
cout << "passed:";
cout << " Overflow word32" << endl;
try
{
temp = false;
AllocatorBase<word64> A;
const size_t max = A.max_size();
SecBlock<word64> t(max+1);
}
catch(const Exception& ex)
{
temp = true;
}
catch(const std::exception& ex)
{
temp = true;
}
result &= temp;
if (!temp)
cout << "FAILED:";
else
cout << "passed:";
cout << " Overflow word64" << endl;
return result;
} }
#endif #endif