1 files changed, 12 insertions, 0 deletions
diff --git a/lib/crypto/CipherAES.h b/lib/crypto/CipherAES.h
index 50b96dc3..dbcce9e5 100644
--- a/lib/crypto/CipherAES.h
+++ b/lib/crypto/CipherAES.h
@@ -37,6 +37,18 @@ public:
 	// Setup any other parameters
 	virtual void SetupParameters(EVP_CIPHER_CTX *pCipherContext) const;
 
+<<<<<<< HEAD
+=======
+	virtual std::string GetCipherName() const
+	{
+		std::ostringstream out;
+		out << "AES";
+		out << mKeyLength;
+		return out.str();
+	}
+	virtual CipherMode GetCipherMode() const { return mMode; }
+
+>>>>>>> 0.12
 private:
 	CipherDescription::CipherMode mMode;
 	const void *mpKey;