edits

diff --git a/src/java/iotcloud/Slot.java b/src/java/iotcloud/Slot.java
index 8d12fc27cfa3d4c2c24397d9b61b0c810f695d4a..841e81888d0a456f2d93062109dd02f3c3fb8165 100644 (file)
--- a/src/java/iotcloud/Slot.java
+++ b/src/java/iotcloud/Slot.java
@@ -14,10 +14,6 @@ class Slot {
        long machineid;
        Vector<Entry> entries;
 
-       Slot(Vector _entries) {
-               entries=_entries;
-       }
-
        Slot(long _seqnum, long _machineid, byte[] _prevhmac, byte[] _hmac, Vector<Entry> _entries) {
                seqnum=_seqnum;
                machineid=_machineid;

diff --git a/src/java/iotcloud/Table.java b/src/java/iotcloud/Table.java
index beceb7cc9a04f9fe2824c9d6ec2dc177a01c75b7..ad5f69ef47b74f2526b95773521e015a66be4c8b 100644 (file)
--- a/src/java/iotcloud/Table.java
+++ b/src/java/iotcloud/Table.java
@@ -1,6 +1,43 @@
 package iotcloud;
+import java.util.HashMap;
+import javax.crypto.spec.*;
+import javax.crypto.*;
 
 public class Table {
-       int tablesize;
+       int numslots;
+       HashMap table=new HashMap();
+       CloudComm cloud;
+       private Cipher encryptCipher;
+       private Cipher decryptCipher;
+       private Mac hmac;
        
+       public Table(String baseurl, String password) {
+               cloud=new CloudComm(baseurl);
+               initCiphers(password);
+       }
+       
+       private void initCiphers(String password) {
+               try {
+                       SecretKeySpec secret=getKey(password);
+                       encryptCipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+                       encryptCipher.init(Cipher.ENCRYPT_MODE, secret);
+                       decryptCipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+                       decryptCipher.init(Cipher.DECRYPT_MODE, secret);
+                       hmac = Mac.getInstance("HmacSHA256");
+                       hmac.init(secret);
+               } catch (Exception e) {
+                       throw new Error("Failed To Initialize Ciphers");
+               }
+       }
+
+       private SecretKeySpec getKey(String password) {
+               try {
+                       PBEKeySpec keyspec = new PBEKeySpec(password.toCharArray());
+                       SecretKey key = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256").generateSecret(keyspec);
+                       SecretKeySpec secret = new SecretKeySpec(key.getEncoded(), "AES");
+                       return secret;
+               } catch (Exception e) {
+                       throw new Error("Failed generating key.");
+               }
+       }
 }