edits

[iotcloud.git] / src / java / iotcloud / Table.java

diff --git a/src/java/iotcloud/Table.java b/src/java/iotcloud/Table.java
index c92aef93ec4b7df6c918fca27dec4e8093a77141..1d27932350abbd26c2384096b86b7949fb6b0e6d 100644 (file)
--- a/src/java/iotcloud/Table.java
+++ b/src/java/iotcloud/Table.java
@@ -2,8 +2,6 @@ package iotcloud;
 import java.util.HashMap;
 import java.util.Arrays;
 import java.util.Vector;
-import javax.crypto.spec.*;
-import javax.crypto.*;
 
 final public class Table {
        private int numslots;
@@ -11,7 +9,6 @@ final public class Table {
        private HashMap<Long, Pair<Long, Liveness> > lastmessagetable=new HashMap<Long, Pair<Long, Liveness> >();
        private SlotBuffer buffer;
        private CloudComm cloud;
-       private Mac hmac;
        private long sequencenumber;
        private long localmachineid;
        private TableStatus lastTableStatus;
@@ -23,7 +20,7 @@ final public class Table {
                buffer = new SlotBuffer();
                numslots = buffer.capacity();
                sequencenumber = 0;
-               initCloud(baseurl, password);
+               cloud=new CloudComm(baseurl, password);
        }
 
        public Table(CloudComm _cloud, long _localmachineid) {
@@ -34,32 +31,6 @@ final public class Table {
                cloud=_cloud;
        }
 
-       private void initCloud(String baseurl, String password) {
-               try {
-                       SecretKeySpec secret=getKey(password);
-                       Cipher encryptCipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
-                       encryptCipher.init(Cipher.ENCRYPT_MODE, secret);
-                       Cipher decryptCipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
-                       decryptCipher.init(Cipher.DECRYPT_MODE, secret);
-                       hmac = Mac.getInstance("HmacSHA256");
-                       hmac.init(secret);
-                       cloud=new CloudComm(baseurl, encryptCipher, decryptCipher, hmac);
-               } 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.");
-               }
-       }
-
        public void update() {
                Slot[] newslots=cloud.getSlots(sequencenumber+1);