security: Add KeyParams to support multiple types of keys.
Different types of keys may require different size options and default key size.
This commit also fixes the undefined behavior when processing the password of TPM.
Change-Id: I8fb95f28468be8299002f0d5146a4496ea1da25f
Refs: #1660
Refs: #1693
diff --git a/src/security/sec-tpm.cpp b/src/security/sec-tpm.cpp
index 2c3d976..2011a95 100644
--- a/src/security/sec-tpm.cpp
+++ b/src/security/sec-tpm.cpp
@@ -295,5 +295,40 @@
return true;
}
+bool
+SecTpm::getImpExpPassWord(std::string& password, const std::string& prompt)
+{
+ bool isInitialized = false;
+
+ char* pw0 = 0;
+
+ pw0 = getpass(prompt.c_str());
+ if (0 == pw0)
+ return false;
+ std::string password1 = pw0;
+ memset(pw0, 0, strlen(pw0));
+
+ pw0 = getpass("Confirm:");
+ if (0 == pw0)
+ {
+ std::fill(password1.begin(), password1.end(), 0);
+ return false;
+ }
+
+ if (0 == password1.compare(pw0))
+ {
+ isInitialized = true;
+ password.swap(password1);
+ }
+
+ std::fill(password1.begin(), password1.end(), 0);
+ memset(pw0, 0, strlen(pw0));
+
+ if (password.empty())
+ return false;
+
+ return isInitialized;
+}
+
} // namespace ndn