added support for using encoding parameters and key derivation parameters

1 files changed, 27 insertions, 0 deletions

diff --git a/algparam.cpp b/algparam.cpp
index 268584fd..aebe3c0f 100644
--- a/algparam.cpp
+++ b/algparam.cpp
@@ -10,6 +10,33 @@ NAMESPACE_BEGIN(CryptoPP)
 
 bool (*AssignIntToInteger)(const std::type_info &valueType, void *pInteger, const void *pInt) = NULL;
 
+bool CombinedNameValuePairs::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
+{
+	if (strcmp(name, "ValueNames") == 0)
+		return m_pairs1.GetVoidValue(name, valueType, pValue) && m_pairs2.GetVoidValue(name, valueType, pValue);
+	else
+		return m_pairs1.GetVoidValue(name, valueType, pValue) || m_pairs2.GetVoidValue(name, valueType, pValue);
+}
+
+bool AlgorithmParametersBase::GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
+{
+	if (strcmp(name, "ValueNames") == 0)
+	{
+		ThrowIfTypeMismatch(name, typeid(std::string), valueType);
+		GetParent().GetVoidValue(name, valueType, pValue);
+		(*reinterpret_cast<std::string *>(pValue) += m_name) += ";";
+		return true;
+	}
+	else if (strcmp(name, m_name) == 0)
+	{
+		AssignValue(name, valueType, pValue);
+		m_used = true;
+		return true;
+	}
+	else
+		return GetParent().GetVoidValue(name, valueType, pValue);
+}
+
 NAMESPACE_END
 
 #endif