X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iotcloud.git;a=blobdiff_plain;f=version2%2Fsrc%2FControl%2Fapp%2Fsrc%2Fmain%2Fjava%2Fiotcloud%2FCloudComm.java;h=744c0fe9dd9a8d26b8a9192636bbdbaf7709c48c;hp=aa0791fdf237da1a3d262e8b81ba83f2c6275304;hb=ab01e7f19e7ec3d54f00b356ad511afc7149b9cd;hpb=2a97456b4a18cf21e4b6fd3a70d522d3e28f37b0

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);