commit 2a6d45ae004af796031f9acc11472d1e1c1d6ba6
author Nick Gordon <nmgordon@memphis.edu> Wed Jan 25 14:10:44 2017 -0600
committer Nick Gordon <nmgordon@memphis.edu> Tue Jan 31 14:57:54 2017 -0800
tree 754fcb356e18a7bdc5a7fd30e876ccc86864cc16
parent dd46143beb21d9af025b1ae8ede3e411f2474f5c

security: implement operator== for SigningInfo

refs: #3932

Change-Id: I64230ccafe260bfa8347c977c42f38b009b9bbf9

src/security/signing-info.cpp

diff --git a/src/security/signing-info.cpp b/src/security/signing-info.cpp
index eb8232b..ec17cda 100644
--- a/src/security/signing-info.cpp
+++ b/src/security/signing-info.cpp
@@ -185,5 +185,14 @@
   return os;
 }
 
+bool
+SigningInfo::operator==(const SigningInfo& rhs) const
+{
+  return getSignerType() == rhs.getSignerType() &&
+    getSignerName() == rhs.getSignerName() &&
+    getDigestAlgorithm() == rhs.getDigestAlgorithm() &&
+    getSignatureInfo() == rhs.getSignatureInfo();
+}
+
 } // namespace security
 } // namespace ndn

src/security/signing-info.hpp

diff --git a/src/security/signing-info.hpp b/src/security/signing-info.hpp
index ad97b89..6e8bca4 100644
--- a/src/security/signing-info.hpp
+++ b/src/security/signing-info.hpp
@@ -235,6 +235,15 @@
   static const Name&
   getDigestSha256Identity();
 
+  bool
+  operator==(const SigningInfo& rhs) const;
+
+  bool
+  operator!=(const SigningInfo& rhs) const
+  {
+    return !(*this == rhs);
+  }
+
 private:
   SignerType m_type;
   Name m_name;

tests/unit-tests/security/signing-info.t.cpp

diff --git a/tests/unit-tests/security/signing-info.t.cpp b/tests/unit-tests/security/signing-info.t.cpp
index f111059..2b40a09 100644
--- a/tests/unit-tests/security/signing-info.t.cpp
+++ b/tests/unit-tests/security/signing-info.t.cpp
@@ -166,6 +166,82 @@
   BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(info), "id:/localhost/identity/digest-sha256");
 }
 
+BOOST_AUTO_TEST_CASE(OperatorEquals)
+{
+  // Check name equality
+  SigningInfo info1("id:/my-id");
+  SigningInfo info2("id:/my-id");
+  BOOST_CHECK_EQUAL(info1, info2);
+  // Change name, check inequality
+  info2 = SigningInfo("id:/not-same-id");
+  BOOST_CHECK_NE(info1, info2);
+
+  // Check name, digest algo equality
+  info1 = SigningInfo("id:/my-id");
+  info2 = SigningInfo("id:/my-id");
+  info1.setDigestAlgorithm(DigestAlgorithm::SHA256);
+  info2.setDigestAlgorithm(DigestAlgorithm::SHA256);
+  BOOST_CHECK_EQUAL(info1, info2);
+  // Change digest algo, check inequality
+  info2.setDigestAlgorithm(DigestAlgorithm::NONE);
+  BOOST_CHECK_NE(info1, info2);
+
+  // Check name, digest algo, signature info equality
+  info1 = SigningInfo("id:/my-id");
+  info2 = SigningInfo("id:/my-id");
+  info1.setDigestAlgorithm(DigestAlgorithm::SHA256);
+  info2.setDigestAlgorithm(DigestAlgorithm::SHA256);
+  SignatureInfo sigInfo1(tlv::SignatureTypeValue::DigestSha256);
+  info1.setSignatureInfo(sigInfo1);
+  info2.setSignatureInfo(sigInfo1);
+  BOOST_CHECK_EQUAL(info1, info2);
+  // Change signature info, check inequality
+  SignatureInfo sigInfo2(tlv::SignatureTypeValue::SignatureSha256WithRsa);
+  info2.setSignatureInfo(sigInfo2);
+  BOOST_CHECK_NE(info1, info2);
+}
+
+BOOST_AUTO_TEST_CASE(OperatorEqualsDifferentTypes)
+{
+  SigningInfo info1("key:/my-id/KEY/1");
+  SigningInfo info2("key:/my-id/KEY/1");
+  // Check equality for key type
+  BOOST_CHECK_EQUAL(info1, info2);
+  info2 = SigningInfo("id:/my-id");
+  // Change signature type, check inequality
+  BOOST_CHECK_NE(info1, info2);
+  info2 = SigningInfo("key:/not-same-id/KEY/1");
+  // Change key name, check inequality
+  BOOST_CHECK_NE(info1, info2);
+
+  info1 = SigningInfo("cert:/my-id/KEY/1/self/%FD01");
+  info2 = SigningInfo("cert:/my-id/KEY/1/self/%FD01");
+  // Check equality for cert type
+  BOOST_CHECK_EQUAL(info1, info2);
+  info2 = SigningInfo("cert:/not-my-id/KEY/1/other/%FD01");
+  // Change cert name, check inequality
+  BOOST_CHECK_NE(info1, info2);
+  info2 = SigningInfo("id:/my-id");
+  // Change signature type, check inequality
+  BOOST_CHECK_NE(info1, info2);
+
+  info1 = SigningInfo(SigningInfo::SIGNER_TYPE_NULL);
+  info2 = SigningInfo(SigningInfo::SIGNER_TYPE_NULL);
+  // Check equality for null type
+  BOOST_CHECK_EQUAL(info1, info2);
+  info2 = SigningInfo("id:/my-id");
+  // Change signature type, check inequality
+  BOOST_CHECK_NE(info1, info2);
+
+  info1 = SigningInfo(SigningInfo::SIGNER_TYPE_SHA256);
+  info2 = SigningInfo(SigningInfo::SIGNER_TYPE_SHA256);
+  // Check equality for SHA256 digest type
+  BOOST_CHECK_EQUAL(info1, info2);
+  info2 = SigningInfo("id:/my-id");
+  // Change signature type, check inequality
+  BOOST_CHECK_NE(info1, info2);
+}
+
 BOOST_AUTO_TEST_SUITE_END() // TestSigningInfo
 BOOST_AUTO_TEST_SUITE_END() // Security