From ad0cd81faf06c83b4e723b3d621e051756460bdd Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@anytun.org>
Date: Sun, 24 Feb 2008 00:58:19 +0000
Subject: changed cipher option default value to aes-ctr added option for key
 derivation, default is aes-ctr

---
 keyDerivation.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'keyDerivation.h')

diff --git a/keyDerivation.h b/keyDerivation.h
index f660efa..6f52099 100644
--- a/keyDerivation.h
+++ b/keyDerivation.h
@@ -51,7 +51,7 @@ typedef enum {
 class KeyDerivation
 {
 public:
-  KeyDerivation() : ld_kdr_(0), master_salt_(0), cipher_(NULL) {};
+  KeyDerivation() : ld_kdr_(0), master_salt_(0), master_key_(0), cipher_(NULL) {};
   virtual ~KeyDerivation();
 
   void init(Buffer key, Buffer salt);
@@ -83,5 +83,15 @@ protected:
 };
 
 
+class NullKeyDerivation
+{
+
+};
+
+class AesIcmKeyDerivation
+{
+  
+};
+
 #endif
 
-- 
cgit v1.2.3