commit f82d13a4741796b46371efdf938f5dfc1266e99a
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Apr 30 14:30:19 2014 -0700
committer Alex Afanasyev <alexander.afanasyev@ucla.edu> Wed Apr 30 17:29:10 2014 -0700
tree f7e13528ba8e7c6e2e4a7d7ad067d1c689b2c576
parent 42464b104523f8e5e036500ea90179928fc1a015

security: Fixing memory leaks and properly handling non-existing keys

Change-Id: I9145b009d9d9d5e7862a26d0be8c3b7085a42c4b
Refs: #1562, #1563

tests/security/test-sec-tpm-osx.cpp

diff --git a/tests/security/test-sec-tpm-osx.cpp b/tests/security/test-sec-tpm-osx.cpp
index 0da4233..f8df5e8 100644
--- a/tests/security/test-sec-tpm-osx.cpp
+++ b/tests/security/test-sec-tpm-osx.cpp
@@ -22,7 +22,7 @@
 
 BOOST_AUTO_TEST_SUITE(SecurityTestSecTpmOsx)
 
-BOOST_AUTO_TEST_CASE (Delete)
+BOOST_AUTO_TEST_CASE(Delete)
 {
   SecTpmOsx tpm;
 
@@ -40,7 +40,7 @@
   BOOST_REQUIRE_EQUAL(tpm.doesKeyExistInTpm(keyName, KEY_CLASS_PRIVATE), false);
 }
 
-BOOST_AUTO_TEST_CASE (SignVerify)
+BOOST_AUTO_TEST_CASE(SignVerify)
 {
   SecTpmOsx tpm;
 
@@ -81,7 +81,7 @@
   tpm.deleteKeyPairInTpm(keyName);
 }
 
-BOOST_AUTO_TEST_CASE (RandomGenerator)
+BOOST_AUTO_TEST_CASE(RandomGenerator)
 {
   SecTpmOsx tpm;
 
@@ -102,7 +102,7 @@
 
 }
 
-BOOST_AUTO_TEST_CASE (ExportImportKey)
+BOOST_AUTO_TEST_CASE(ExportImportKey)
 {
   using namespace CryptoPP;
 
@@ -165,6 +165,25 @@
   // BOOST_REQUIRE(tpm.doesKeyExistInTpm(keyName, KEY_CLASS_PUBLIC) == false);
 }
 
+BOOST_AUTO_TEST_CASE(NonExistingKey)
+{
+  using namespace CryptoPP;
+
+  SecTpmOsx tpm;
+
+  Name keyName("/TestSecTpmOsx/NonExistingKey");
+
+  BOOST_REQUIRE_THROW(tpm.getPublicKeyFromTpm(keyName), SecTpmOsx::Error);
+
+  const uint8_t content[] = {0x01, 0x02, 0x03, 0x04};
+  BOOST_REQUIRE_THROW(tpm.signInTpm(content, sizeof(content), keyName, DIGEST_ALGORITHM_SHA256),
+                      SecTpmOsx::Error);
+
+  BOOST_REQUIRE_THROW(tpm.signInTpm(0, 1, keyName, DIGEST_ALGORITHM_SHA256),
+                      SecTpmOsx::Error);
+}
+
+
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace ndn