X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Futils%2FCryptUtils.java;h=638f82f298a27b6d87db29ae5324f904ccff08eb;hb=2e465ed3dc72efcdf96e419b39d6119c0cc41c6c;hp=9ef91015ad14f0ecc5c3d45f3f242628160146cc;hpb=f8147a0ee57317e96d9ff0bf19573f7168d0354c;p=nikiroo-utils.git diff --git a/src/be/nikiroo/utils/CryptUtils.java b/src/be/nikiroo/utils/CryptUtils.java index 9ef9101..638f82f 100644 --- a/src/be/nikiroo/utils/CryptUtils.java +++ b/src/be/nikiroo/utils/CryptUtils.java @@ -4,17 +4,13 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.UnsupportedEncodingException; -import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.CipherInputStream; import javax.crypto.CipherOutputStream; import javax.crypto.IllegalBlockSizeException; -import javax.crypto.NoSuchPaddingException; -import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; import javax.net.ssl.SSLException; @@ -25,22 +21,24 @@ import be.nikiroo.utils.streams.Base64OutputStream; /** * Small utility class to do AES encryption/decryption. *
- * For the moment, it is multi-thread compatible, but beware: + * It is multi-thread compatible, but beware: *
- * Do not assume it is actually secure until you checked the code... + * 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 */ public class CryptUtils { - static private final String AES_NAME = "AES/CFB8/NoPadding"; + static private final String AES_NAME = "AES/CFB128/NoPadding"; private Cipher ecipher; private Cipher dcipher; - private SecretKey key; + private byte[] bytes32; /** * Small and lazy-easy way to initialize a 128 bits key with @@ -65,15 +63,15 @@ public class CryptUtils { } /** - * 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. *
- * The key must be exactly 128 bytes long. + * The key must 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); @@ -198,7 +196,7 @@ public class CryptUtils { } /** - * This method required an array of 128 bytes. + * This method required an array of 128 bits. * * @param bytes32 * the array, which must be of 128 bits (32 bytes) @@ -214,9 +212,9 @@ public class CryptUtils { + " 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); } /** @@ -231,29 +229,20 @@ public class CryptUtils { */ 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 (NoSuchAlgorithmException e) { - // Every implementation of the Java platform is required to support - // this standard Cipher transformation with 128 bits keys - e.printStackTrace(); - } catch (NoSuchPaddingException e) { - // Every implementation of the Java platform is required to support - // this standard Cipher transformation with 128 bits keys - e.printStackTrace(); - } catch (InvalidKeyException e) { - // Every implementation of the Java platform is required to support - // this standard Cipher transformation with 128 bits keys - e.printStackTrace(); - } catch (InvalidAlgorithmParameterException e) { - // Woops? + } catch (Exception e) { e.printStackTrace(); + throw new RuntimeException( + "Cannot initialize encryption sub-system", e); } - - return null; } /** @@ -377,7 +366,7 @@ public class CryptUtils { 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; } @@ -428,7 +417,7 @@ public class CryptUtils { 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) {