From: Ali Younis <ayounis@uci.edu>
Date: Thu, 5 Oct 2017 23:28:41 +0000 (-0700)
Subject: Changed to no padding
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iotcloud.git;a=commitdiff_plain;h=ab01e7f19e7ec3d54f00b356ad511afc7149b9cd

Changed to no padding
---

diff --git a/version2/src/Control/app/src/main/java/iotcloud/CloudComm.java b/version2/src/Control/app/src/main/java/iotcloud/CloudComm.java
index aa0791f..744c0fe 100644
--- a/version2/src/Control/app/src/main/java/iotcloud/CloudComm.java
+++ b/version2/src/Control/app/src/main/java/iotcloud/CloudComm.java
@@ -482,7 +482,7 @@ class CloudComm {
 	private byte[] encryptSlotAndPrependIV(byte[] rawData, byte[] ivBytes) {
 		try {
 			IvParameterSpec ivSpec = new IvParameterSpec(ivBytes);
-			Cipher cipher = Cipher.getInstance("AES/CTR/PKCS5Padding");
+			Cipher cipher = Cipher.getInstance("AES/CTR/NoPadding");
 			cipher.init(Cipher.ENCRYPT_MODE, key, ivSpec);
 
 			byte[] encryptedBytes = cipher.doFinal(rawData);
@@ -509,7 +509,7 @@ class CloudComm {
 
 			IvParameterSpec ivSpec = new IvParameterSpec(ivBytes);
 
-			Cipher cipher = Cipher.getInstance("AES/CTR/PKCS5Padding");
+			Cipher cipher = Cipher.getInstance("AES/CTR/NoPadding");
 			cipher.init(Cipher.DECRYPT_MODE, key, ivSpec);
 
 			return cipher.doFinal(encryptedBytes);
diff --git a/version2/src/java/iotcloud/CloudComm.java b/version2/src/java/iotcloud/CloudComm.java
index 1b10efe..f12c276 100644
--- a/version2/src/java/iotcloud/CloudComm.java
+++ b/version2/src/java/iotcloud/CloudComm.java
@@ -8,6 +8,9 @@ import javax.crypto.spec.*;
 import java.security.SecureRandom;
 import java.nio.ByteBuffer;
 
+
+import java.util.*;
+
 /**
  * This class provides a communication API to the webserver.  It also
  * validates the HMACs on the slots and handles encryption.
@@ -256,7 +259,7 @@ class CloudComm {
 	private byte[] encryptSlotAndPrependIV(byte[] rawData, byte[] ivBytes) {
 		try {
 			IvParameterSpec ivSpec = new IvParameterSpec(ivBytes);
-			Cipher cipher = Cipher.getInstance("AES/CTR/PKCS5Padding");
+			Cipher cipher = Cipher.getInstance("AES/CTR/NoPadding");
 			cipher.init(Cipher.ENCRYPT_MODE, key, ivSpec);
 
 			byte[] encryptedBytes = cipher.doFinal(rawData);
@@ -283,9 +286,8 @@ class CloudComm {
 
 			IvParameterSpec ivSpec = new IvParameterSpec(ivBytes);
 
-			Cipher cipher = Cipher.getInstance("AES/CTR/PKCS5Padding");
+			Cipher cipher = Cipher.getInstance("AES/CTR/NoPadding");
 			cipher.init(Cipher.DECRYPT_MODE, key, ivSpec);
-
 			return cipher.doFinal(encryptedBytes);
 
 		} catch (Exception e) {