security: Pair-up Tpm and Pib in KeyChain
In this commit, we also change the HOME setting for test cases.
Change-Id: I7fa15461555b3519d9d2005c6956c167ed07d66f
Refs: #2242
Refs: #2260
diff --git a/src/security/sec-tpm-file.hpp b/src/security/sec-tpm-file.hpp
index 3c97e4e..f9d954e 100644
--- a/src/security/sec-tpm-file.hpp
+++ b/src/security/sec-tpm-file.hpp
@@ -49,9 +49,7 @@
SecTpmFile(const std::string& dir = "");
virtual
- ~SecTpmFile()
- {
- }
+ ~SecTpmFile();
virtual void
setTpmPassword(const uint8_t* password, size_t passwordLength)
@@ -124,6 +122,8 @@
////////////////////////////////
// From TrustedPlatformModule //
////////////////////////////////
+ virtual std::string
+ getScheme();
virtual ConstBufferPtr
exportPrivateKeyPkcs8FromTpm(const Name& keyName);
@@ -134,12 +134,15 @@
virtual bool
importPublicKeyPkcs1IntoTpm(const Name& keyName, const uint8_t* buf, size_t size);
+public:
+ static const std::string SCHEME;
+
private:
class Impl;
- shared_ptr<Impl> m_impl;
+ unique_ptr<Impl> m_impl;
bool m_inTerminal;
};
} // namespace ndn
-#endif //NDN_SECURITY_SEC_TPM_FILE_HPP
+#endif // NDN_SECURITY_SEC_TPM_FILE_HPP