security: renaming methods
1. renaming Verifier::policies to Verifier::policy
2. appending SecTpm related methods with "InTpm"
Change-Id: I3790947d3f236e8d56fd52eaefc6e2bbaea92385
diff --git a/include/ndn-cpp/security/key-chain.hpp b/include/ndn-cpp/security/key-chain.hpp
index 8e1e81c..fffa05d 100644
--- a/include/ndn-cpp/security/key-chain.hpp
+++ b/include/ndn-cpp/security/key-chain.hpp
@@ -184,7 +184,7 @@
data.setSignature(signature);
// For temporary usage, we support RSA + SHA256 only, but will support more.
- Tpm::sign(data, cert->getPublicKeyName(), DIGEST_ALGORITHM_SHA256);
+ Tpm::signInTpm(data, cert->getPublicKeyName(), DIGEST_ALGORITHM_SHA256);
}
void
@@ -195,7 +195,7 @@
data.setSignature(signature);
// For temporary usage, we support RSA + SHA256 only, but will support more.
- Tpm::sign(data, certificate.getPublicKeyName(), DIGEST_ALGORITHM_SHA256);
+ Tpm::signInTpm(data, certificate.getPublicKeyName(), DIGEST_ALGORITHM_SHA256);
}
/**
@@ -216,7 +216,7 @@
signature.setKeyLocator(certificateName.getPrefix(-1)); // implicit conversion should take care
// For temporary usage, we support RSA + SHA256 only, but will support more.
- signature.setValue(Tpm::sign(buffer, bufferLength, cert->getPublicKeyName(), DIGEST_ALGORITHM_SHA256));
+ signature.setValue(Tpm::signInTpm(buffer, bufferLength, cert->getPublicKeyName(), DIGEST_ALGORITHM_SHA256));
return signature;
}
@@ -296,7 +296,7 @@
cert.setSignature(signature);
// For temporary usage, we support RSA + SHA256 only, but will support more.
- Tpm::sign(cert, cert.getPublicKeyName(), DIGEST_ALGORITHM_SHA256);
+ Tpm::signInTpm(cert, cert.getPublicKeyName(), DIGEST_ALGORITHM_SHA256);
}
diff --git a/include/ndn-cpp/security/sec-tpm-memory.hpp b/include/ndn-cpp/security/sec-tpm-memory.hpp
index 5761597..8203272 100644
--- a/include/ndn-cpp/security/sec-tpm-memory.hpp
+++ b/include/ndn-cpp/security/sec-tpm-memory.hpp
@@ -67,10 +67,10 @@
* @return The signature, or a null pointer if signing fails.
*/
virtual Block
- sign(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);
virtual void
- sign(Data &data, const Name& keyName, DigestAlgorithm digestAlgorithm);
+ signInTpm(Data &data, const Name& keyName, DigestAlgorithm digestAlgorithm);
/**
* Decrypt data.
@@ -81,7 +81,7 @@
* @return The decrypted data.
*/
virtual ConstBufferPtr
- decrypt(const Name& keyName, const uint8_t* data, size_t dataLength, bool isSymmetric);
+ decryptInTpm(const Name& keyName, const uint8_t* data, size_t dataLength, bool isSymmetric);
/**
* Encrypt data.
@@ -92,7 +92,7 @@
* @return The encrypted data.
*/
virtual ConstBufferPtr
- encrypt(const Name& keyName, const uint8_t* data, size_t dataLength, bool isSymmetric);
+ encryptInTpm(const Name& keyName, const uint8_t* data, size_t dataLength, bool isSymmetric);
/**
* @brief Generate a symmetric key.
@@ -101,7 +101,7 @@
* @param keySize The size of the key.
*/
virtual void
- generateSymmetricKey(const Name& keyName, KeyType keyType, int keySize);
+ generateSymmetricKeyInTpm(const Name& keyName, KeyType keyType, int keySize);
/**
* Check if a particular key exists.
@@ -110,7 +110,7 @@
* @return True if the key exists, otherwise false.
*/
virtual bool
- doesKeyExist(const Name& keyName, KeyClass keyClass);
+ doesKeyExistInTpm(const Name& keyName, KeyClass keyClass);
private:
class RsaPrivateKey;
diff --git a/include/ndn-cpp/security/sec-tpm-osx.hpp b/include/ndn-cpp/security/sec-tpm-osx.hpp
index 71efa13..47e83ab 100644
--- a/include/ndn-cpp/security/sec-tpm-osx.hpp
+++ b/include/ndn-cpp/security/sec-tpm-osx.hpp
@@ -43,10 +43,10 @@
getPublicKeyFromTpm(const Name& keyName);
virtual Block
- sign(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);
virtual void
- sign(Data &data, const Name& keyName, DigestAlgorithm digestAlgorithm);
+ signInTpm(Data &data, const Name& keyName, DigestAlgorithm digestAlgorithm);
/**
* Decrypt data.
@@ -57,7 +57,7 @@
* @return The decrypted data.
*/
virtual ConstBufferPtr
- decrypt(const Name& keyName, const uint8_t* data, size_t dataLength, bool isSymmetric);
+ decryptInTpm(const Name& keyName, const uint8_t* data, size_t dataLength, bool isSymmetric);
/**
* Encrypt data.
@@ -68,7 +68,7 @@
* @return The encrypted data.
*/
virtual ConstBufferPtr
- encrypt(const Name& keyName, const uint8_t* data, size_t dataLength, bool isSymmetric);
+ encryptInTpm(const Name& keyName, const uint8_t* data, size_t dataLength, bool isSymmetric);
/**
* Generate a symmetric key.
@@ -77,7 +77,7 @@
* @param keySize The size of the key.
*/
virtual void
- generateSymmetricKey(const Name& keyName, KeyType keyType, int keySize);
+ generateSymmetricKeyInTpm(const Name& keyName, KeyType keyType, int keySize);
/**
* Check if a particular key exists.
@@ -86,7 +86,7 @@
* @return True if the key exists, otherwise false.
*/
virtual bool
- doesKeyExist(const Name& keyName, KeyClass keyClass);
+ doesKeyExistInTpm(const Name& keyName, KeyClass keyClass);
////////////////////////////////////////////////////////////////////////////////////
diff --git a/include/ndn-cpp/security/sec-tpm.hpp b/include/ndn-cpp/security/sec-tpm.hpp
index d7a8e04..c6b5328 100644
--- a/include/ndn-cpp/security/sec-tpm.hpp
+++ b/include/ndn-cpp/security/sec-tpm.hpp
@@ -53,10 +53,10 @@
* @return The signature, or a null pointer if signing fails.
*/
virtual Block
- sign(const uint8_t *data, size_t dataLength, const Name& keyName, DigestAlgorithm digestAlgorithm) = 0;
+ signInTpm(const uint8_t *data, size_t dataLength, const Name& keyName, DigestAlgorithm digestAlgorithm) = 0;
virtual void
- sign(Data &data, const Name& keyName, DigestAlgorithm digestAlgorithm) = 0;
+ signInTpm(Data &data, const Name& keyName, DigestAlgorithm digestAlgorithm) = 0;
/**
* Decrypt data.
@@ -67,7 +67,7 @@
* @return The decrypted data.
*/
virtual ConstBufferPtr
- decrypt(const Name& keyName, const uint8_t* data, size_t dataLength, bool isSymmetric) = 0;
+ decryptInTpm(const Name& keyName, const uint8_t* data, size_t dataLength, bool isSymmetric) = 0;
/**
* Encrypt data.
@@ -78,7 +78,7 @@
* @return The encrypted data.
*/
virtual ConstBufferPtr
- encrypt(const Name& keyName, const uint8_t* data, size_t dataLength, bool isSymmetric) = 0;
+ encryptInTpm(const Name& keyName, const uint8_t* data, size_t dataLength, bool isSymmetric) = 0;
/**
* @brief Generate a symmetric key.
@@ -87,7 +87,7 @@
* @param keySize The size of the key.
*/
virtual void
- generateSymmetricKey(const Name& keyName, KeyType keyType, int keySize) = 0;
+ generateSymmetricKeyInTpm(const Name& keyName, KeyType keyType, int keySize) = 0;
/**
* Check if a particular key exists.
@@ -96,7 +96,7 @@
* @return True if the key exists, otherwise false.
*/
virtual bool
- doesKeyExist(const Name& keyName, KeyClass keyClass) = 0;
+ doesKeyExistInTpm(const Name& keyName, KeyClass keyClass) = 0;
};
}
diff --git a/include/ndn-cpp/security/verifier.hpp b/include/ndn-cpp/security/verifier.hpp
index 764dcd4..2dbd995 100644
--- a/include/ndn-cpp/security/verifier.hpp
+++ b/include/ndn-cpp/security/verifier.hpp
@@ -43,7 +43,7 @@
* @return The Policy.
*/
inline SecPolicy&
- policies()
+ policy()
{
if (!policy_)
throw Error("policy is not assigned to the KeyChain");