security: Add SignatureSha256WithEcdsa
Change-Id: Ib3aa460d409c6d780b722e154ef2a620c510b16b
Refs: #1660
diff --git a/src/encoding/tlv.hpp b/src/encoding/tlv.hpp
index e56695c..9d70ee6 100644
--- a/src/encoding/tlv.hpp
+++ b/src/encoding/tlv.hpp
@@ -75,17 +75,21 @@
AppPrivateBlock2 = 32767
};
-enum SignatureType {
+enum SignatureTypeValue {
DigestSha256 = 0,
- SignatureSha256WithRsa = 1
+ SignatureSha256WithRsa = 1,
+ SignatureSha256WithEcdsa = 3
};
-enum ConentType {
+enum ContentTypeValue {
ContentType_Default = 0,
ContentType_Link = 1,
ContentType_Key = 2
};
+/// @deprecated use ContentType instead
+typedef ContentTypeValue ConentType;
+
/**
* @brief Read VAR-NUMBER in NDN-TLV encoding
*
diff --git a/src/security/signature-sha256-with-ecdsa.hpp b/src/security/signature-sha256-with-ecdsa.hpp
new file mode 100644
index 0000000..84cbe51
--- /dev/null
+++ b/src/security/signature-sha256-with-ecdsa.hpp
@@ -0,0 +1,61 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (c) 2013-2014 Regents of the University of California.
+ *
+ * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
+ *
+ * ndn-cxx library is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * ndn-cxx library 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 Lesser General Public License for more details.
+ *
+ * You should have received copies of the GNU General Public License and GNU Lesser
+ * General Public License along with ndn-cxx, e.g., in COPYING.md file. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
+ */
+
+#ifndef NDN_SECURITY_SIGNATURE_SHA256_WITH_ECDSA_HPP
+#define NDN_SECURITY_SIGNATURE_SHA256_WITH_ECDSA_HPP
+
+#include "signature-with-public-key.hpp"
+
+namespace ndn {
+
+/**
+ * represents a Sha256WithEcdsa signature.
+ */
+class SignatureSha256WithEcdsa : public SignatureWithPublicKey
+{
+public:
+ class Error : public SignatureWithPublicKey::Error
+ {
+ public:
+ explicit
+ Error(const std::string& what)
+ : SignatureWithPublicKey::Error(what)
+ {
+ }
+ };
+
+ SignatureSha256WithEcdsa()
+ : SignatureWithPublicKey(Tlv::SignatureSha256WithEcdsa)
+ {
+ }
+
+ explicit
+ SignatureSha256WithEcdsa(const Signature& signature)
+ : SignatureWithPublicKey(signature)
+ {
+ if (getType() != Signature::Sha256WithEcdsa)
+ throw Error("Incorrect signature type");
+ }
+};
+
+} // namespace ndn
+
+#endif //NDN_SECURITY_SIGNATURE_SHA256_WITH_ECDSA_HPP
diff --git a/src/security/signature-sha256-with-rsa.hpp b/src/security/signature-sha256-with-rsa.hpp
index 8acda6e..bd3fd32 100644
--- a/src/security/signature-sha256-with-rsa.hpp
+++ b/src/security/signature-sha256-with-rsa.hpp
@@ -22,67 +22,38 @@
#ifndef NDN_SECURITY_SIGNATURE_SHA256_WITH_RSA_HPP
#define NDN_SECURITY_SIGNATURE_SHA256_WITH_RSA_HPP
-#include "../data.hpp"
-#include "../encoding/tlv.hpp"
+#include "signature-with-public-key.hpp"
namespace ndn {
/**
- * Representing of SHA256-with-RSA signature in a data packet.
+ * Represent a SHA256-with-RSA signature.
*/
-class SignatureSha256WithRsa : public Signature
+class SignatureSha256WithRsa : public SignatureWithPublicKey
{
public:
- class Error : public Signature::Error
+ class Error : public SignatureWithPublicKey::Error
{
public:
explicit
Error(const std::string& what)
- : Signature::Error(what)
+ : SignatureWithPublicKey::Error(what)
{
}
};
SignatureSha256WithRsa()
+ : SignatureWithPublicKey(Tlv::SignatureSha256WithRsa)
{
- m_info = Block(Tlv::SignatureInfo);
-
- m_type = Signature::Sha256WithRsa;
- m_info.push_back(nonNegativeIntegerBlock(Tlv::SignatureType, Tlv::SignatureSha256WithRsa));
- m_info.push_back(m_keyLocator.wireEncode());
}
+ explicit
SignatureSha256WithRsa(const Signature& signature)
- : Signature(signature)
+ : SignatureWithPublicKey(signature)
{
if (getType() != Signature::Sha256WithRsa)
throw Error("Incorrect signature type");
-
- m_info.parse();
- Block::element_const_iterator i = m_info.find(Tlv::KeyLocator);
- if (i != m_info.elements_end())
- {
- m_keyLocator.wireDecode(*i);
- }
}
-
- const KeyLocator&
- getKeyLocator() const
- {
- return m_keyLocator;
- }
-
- void
- setKeyLocator(const KeyLocator& keyLocator)
- {
- m_keyLocator = keyLocator;
-
- m_info.remove(ndn::Tlv::KeyLocator);
- m_info.push_back(m_keyLocator.wireEncode());
- }
-
-private:
- KeyLocator m_keyLocator;
};
} // namespace ndn
diff --git a/src/security/signature-with-public-key.hpp b/src/security/signature-with-public-key.hpp
new file mode 100644
index 0000000..abaa85a
--- /dev/null
+++ b/src/security/signature-with-public-key.hpp
@@ -0,0 +1,89 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (c) 2013-2014 Regents of the University of California.
+ *
+ * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
+ *
+ * ndn-cxx library is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * ndn-cxx library 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 Lesser General Public License for more details.
+ *
+ * You should have received copies of the GNU General Public License and GNU Lesser
+ * General Public License along with ndn-cxx, e.g., in COPYING.md file. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
+ */
+
+#ifndef NDN_SECURITY_SIGNATURE_WITH_PUBLIC_KEY_HPP
+#define NDN_SECURITY_SIGNATURE_WITH_PUBLIC_KEY_HPP
+
+#include "../data.hpp"
+#include "../encoding/tlv.hpp"
+
+namespace ndn {
+
+/**
+ * Base class of public key signature.
+ */
+class SignatureWithPublicKey : public Signature
+{
+public:
+ class Error : public Signature::Error
+ {
+ public:
+ explicit
+ Error(const std::string& what)
+ : Signature::Error(what)
+ {
+ }
+ };
+
+ explicit
+ SignatureWithPublicKey(const Tlv::SignatureTypeValue& signatureType)
+ {
+ m_info = Block(Tlv::SignatureInfo);
+
+ m_type = signatureType;
+ m_info.push_back(nonNegativeIntegerBlock(Tlv::SignatureType, signatureType));
+ m_info.push_back(m_keyLocator.wireEncode());
+ }
+
+ explicit
+ SignatureWithPublicKey(const Signature& signature)
+ : Signature(signature)
+ {
+ m_info.parse();
+ Block::element_const_iterator i = m_info.find(Tlv::KeyLocator);
+ if (i != m_info.elements_end())
+ {
+ m_keyLocator.wireDecode(*i);
+ }
+ }
+
+ const KeyLocator&
+ getKeyLocator() const
+ {
+ return m_keyLocator;
+ }
+
+ void
+ setKeyLocator(const KeyLocator& keyLocator)
+ {
+ m_keyLocator = keyLocator;
+
+ m_info.remove(ndn::Tlv::KeyLocator);
+ m_info.push_back(m_keyLocator.wireEncode());
+ }
+
+private:
+ KeyLocator m_keyLocator;
+};
+
+} // namespace ndn
+
+#endif //NDN_SECURITY_SIGNATURE_WITH_PUBLIC_KEY_HPP
diff --git a/src/signature.hpp b/src/signature.hpp
index d678c8e..3546c4c 100644
--- a/src/signature.hpp
+++ b/src/signature.hpp
@@ -22,6 +22,8 @@
#ifndef NDN_SIGNATURE_HPP
#define NDN_SIGNATURE_HPP
+#include "encoding/tlv.hpp"
+
namespace ndn {
/**
@@ -41,8 +43,9 @@
};
enum {
- Sha256 = 0,
- Sha256WithRsa = 1
+ Sha256 = Tlv::DigestSha256,
+ Sha256WithRsa = Tlv::SignatureSha256WithRsa,
+ Sha256WithEcdsa = Tlv::SignatureSha256WithEcdsa
};
Signature()