Add key generation

diff --git a/version2/src/C/Crypto.cc b/version2/src/C/Crypto.cc
index 3c66c90146a8f8c0d83b849d1b54a9877e6b465f..e54d541afefbf66defb124fda213e5af6a36ed81 100644 (file)
--- a/version2/src/C/Crypto.cc
+++ b/version2/src/C/Crypto.cc
@@ -1 +1,13 @@
 #include "Crypto.h"
+#include "pbkdf2-sha256.h"
+
+AESKey::AESKey(Array<char> *password, Array<char> *salt, int iterationCount, int keyLength) {
+       key = new Array<char>(keyLength);
+       PKCS5_PBKDF2_HMAC((unsigned char *) password->internalArray(), password->length(),
+                                                                               (unsigned char *) salt->internalArray(), salt->length(),
+                                                                               iterationCount, keyLength, (unsigned char *) key->internalArray());
+}
+
+AESKey::~AESKey() {
+       delete key;
+}

diff --git a/version2/src/C/Crypto.h b/version2/src/C/Crypto.h
index 261e5a63c7cfd1b6c8273510711153930d3d19d0..27c5b4c3b8eebb23b0f95920bb531cbae8fd925b 100644 (file)
--- a/version2/src/C/Crypto.h
+++ b/version2/src/C/Crypto.h
@@ -5,8 +5,9 @@
 class AESKey {
 public:
        AESKey(Array<char> *password, Array<char> *salt, int iterationCount, int keyLength);
-
+       ~AESKey();
 private:
+       Array<char> * key;
 };
 
 #endif

diff --git a/version2/src/C/pbkdf2-sha256.cc b/version2/src/C/pbkdf2-sha256.cc
index d014787103f922c9ddea822f890f7c54411a1bda..9e201f86addc3702fceb740291ab7925d0c7e8fb 100644 (file)
--- a/version2/src/C/pbkdf2-sha256.cc
+++ b/version2/src/C/pbkdf2-sha256.cc
@@ -31,6 +31,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include "pbkdf2-sha256.h"
 
 typedef struct {
        unsigned long total[2]; /*!< number of bytes processed  */

diff --git a/version2/src/C/pbkdf2-sha256.h b/version2/src/C/pbkdf2-sha256.h
new file mode 100644 (file)
index 0000000..9a79572
--- /dev/null
+++ b/version2/src/C/pbkdf2-sha256.h
@@ -0,0 +1,9 @@
+#ifndef PBKDF2_SHA256_H
+#define PBKDF2_SHA256_H
+
+void PKCS5_PBKDF2_HMAC(unsigned char *password, size_t plen,
+                                                                                        unsigned char *salt, size_t slen,
+                                                                                        const unsigned long iteration_count, const unsigned long key_length,
+                                                                                        unsigned char *output);
+
+#endif