security: Explicitly request password to unlock keychain
refs: #1224
Change-Id: Ia6589772e32b8dbbe57a49a2661fcf451e9b6dd8
diff --git a/src/security/sec-tpm-osx.hpp b/src/security/sec-tpm-osx.hpp
index 915bb1d..1f95cdc 100644
--- a/src/security/sec-tpm-osx.hpp
+++ b/src/security/sec-tpm-osx.hpp
@@ -16,13 +16,13 @@
class SecTpmOsx : public SecTpm {
public:
- struct Error : public SecTpm::Error { Error(const std::string &what) : SecTpm::Error(what) {} };
+ struct Error : public SecTpm::Error { Error(const std::string& what) : SecTpm::Error(what) {} };
/**
* constructor of OSXKeyChainTpm
* @param keychainName the name of keychain
*/
- SecTpmOsx(const std::string & keychainName = "");
+ SecTpmOsx();
/**
* destructor of OSXKeyChainTpm
@@ -40,13 +40,13 @@
* @param keyName The name of the key pair.
*/
virtual void
- deleteKeyPairInTpm(const Name &keyName);
+ deleteKeyPairInTpm(const Name& keyName);
virtual ptr_lib::shared_ptr<PublicKey>
getPublicKeyFromTpm(const Name& keyName);
virtual Block
- signInTpm(const uint8_t *data, size_t dataLength, const Name& keyName, DigestAlgorithm digestAlgorithm);
+ signInTpm(const uint8_t* data, size_t dataLength, const Name& keyName, DigestAlgorithm digestAlgorithm);
/**
* Decrypt data.
@@ -102,7 +102,7 @@
* @returns true if setting succeeds
*/
bool
- setACL(const Name & keyName, KeyClass keyClass, int acl, const std::string & appPath);
+ setACL(const Name& keyName, KeyClass keyClass, int acl, const std::string& appPath);
// /**
// * verify data (test only)
@@ -117,7 +117,7 @@
private:
class Impl;
- std::auto_ptr<Impl> impl_;
+ std::auto_ptr<Impl> m_impl;
};
} // namespace ndn