security: Update Signature abstraction to match 0.1.1 spec
This commit removes intermediate SignatureWithPublicKey data
structure. All uses of such data structure should be replaced with just
Signature and check that KeyLocator is present (hasKeyLocator()).
Change-Id: I1157e05c6a717ea28df91c4bfd76c7145b520a15
Refs: #1750
diff --git a/src/security/signature-sha256-with-rsa.hpp b/src/security/signature-sha256-with-rsa.hpp
index fc60248..94f9e30 100644
--- a/src/security/signature-sha256-with-rsa.hpp
+++ b/src/security/signature-sha256-with-rsa.hpp
@@ -22,38 +22,31 @@
#ifndef NDN_SECURITY_SIGNATURE_SHA256_WITH_RSA_HPP
#define NDN_SECURITY_SIGNATURE_SHA256_WITH_RSA_HPP
-#include "signature-with-public-key.hpp"
+#include "../signature.hpp"
namespace ndn {
/**
* Represent a SHA256-with-RSA signature.
*/
-class SignatureSha256WithRsa : public SignatureWithPublicKey
+class SignatureSha256WithRsa : public Signature
{
public:
- class Error : public SignatureWithPublicKey::Error
+ class Error : public Signature::Error
{
public:
explicit
Error(const std::string& what)
- : SignatureWithPublicKey::Error(what)
+ : Signature::Error(what)
{
}
};
- SignatureSha256WithRsa()
- : SignatureWithPublicKey(Tlv::SignatureSha256WithRsa)
- {
- }
+ explicit
+ SignatureSha256WithRsa(const KeyLocator& keyLocator = KeyLocator());
explicit
- SignatureSha256WithRsa(const Signature& signature)
- : SignatureWithPublicKey(signature)
- {
- if (getType() != Tlv::SignatureSha256WithRsa)
- throw Error("Incorrect signature type");
- }
+ SignatureSha256WithRsa(const Signature& signature);
};
} // namespace ndn