import javax.crypto.CipherInputStream;
import javax.crypto.CipherOutputStream;
import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.SecretKey;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import javax.net.ssl.SSLException;
/**
* Small utility class to do AES encryption/decryption.
* <p>
- * For the moment, it is multi-thread compatible, but beware:
+ * It is multi-thread compatible, but beware:
* <ul>
* <li>The encrypt/decrypt calls are serialized</li>
- * <li>The streams are independent and thus parallel</li>
+ * <li>The streams are independent (and thus parallel)</li>
* </ul>
* <p>
- * Do not assume it is actually secure, it is actually not.
- * <p>
- * It just here to offer a more-or-less protected exchange of data because
- * anonymous and self-signed certificates backed SSL is against Google wishes
- * (so, don't even try, they own Internet).
+ * Do not assume it is secure; it just here to offer a more-or-less protected
+ * exchange of data because anonymous and self-signed certificates backed SSL is
+ * against Google wishes, and I need Android support.
*
* @author niki
*/
private Cipher ecipher;
private Cipher dcipher;
- private SecretKey key;
+ private byte[] bytes32;
/**
* Small and lazy-easy way to initialize a 128 bits key with
}
/**
- * Create a new instance of {@link CryptUtils} with the given 128 bytes key.
+ * Create a new instance of {@link CryptUtils} with the given 128 bits key.
* <p>
- * The key <b>must</b> be exactly 128 bytes long.
+ * The key <b>must</b> be exactly 128 bits long.
*
* @param bytes32
* the 128 bits (32 bytes) of the key
*
* @throws InvalidKeyException
- * if the key is not an array of 128 bytes
+ * if the key is not an array of 128 bits
*/
public CryptUtils(byte[] bytes32) throws InvalidKeyException {
init(bytes32);
}
/**
- * This method required an array of 128 bytes.
+ * This method required an array of 128 bits.
*
* @param bytes32
* the array, which <b>must</b> be of 128 bits (32 bytes)
+ " bytes");
}
- key = new SecretKeySpec(bytes32, "AES");
- ecipher = newCipher(Cipher.ENCRYPT_MODE);
- dcipher = newCipher(Cipher.DECRYPT_MODE);
+ this.bytes32 = bytes32;
+ this.ecipher = newCipher(Cipher.ENCRYPT_MODE);
+ this.dcipher = newCipher(Cipher.DECRYPT_MODE);
}
/**
*/
private Cipher newCipher(int mode) {
try {
- byte[] iv = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+ // bytes32 = 32 bytes, 32 > 16
+ byte[] iv = new byte[16];
+ for (int i = 0; i < iv.length; i++) {
+ iv[i] = bytes32[i];
+ }
IvParameterSpec ivspec = new IvParameterSpec(iv);
Cipher cipher = Cipher.getInstance(AES_NAME);
- cipher.init(mode, key, ivspec);
+ cipher.init(mode, new SecretKeySpec(bytes32, "AES"), ivspec);
return cipher;
} catch (Exception e) {
e.printStackTrace();
try {
return new String(decrypt(data), "UTF-8");
} catch (UnsupportedEncodingException e) {
- // UTF-8 is required in all confirm JVMs
+ // UTF-8 is required in all conform JVMs
e.printStackTrace();
return null;
}
try {
return new String(decrypt(StringUtils.unbase64(data)), "UTF-8");
} catch (UnsupportedEncodingException e) {
- // UTF-8 is required in all confirm JVMs
+ // UTF-8 is required in all conform JVMs
e.printStackTrace();
return null;
} catch (IOException e) {