@@ -26,19 +27,24 @@ import javax.net.ssl.SSLException; *
- * Do not assume it is actually secure until you checked the code... + * Do not assume it is actually secure, it is actually not. + *
+ * 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). * * @author niki */ public class CryptUtils { - static private final String AES_NAME = "AES/ECB/PKCS5Padding"; - + 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 {@link CryptUtils}. + * Small and lazy-easy way to initialize a 128 bits key with + * {@link CryptUtils}. *
* Some part of the key will be used to generate a 128 bits key and * initialize the {@link CryptUtils}; even NULL will generate something. @@ -81,50 +87,116 @@ public class CryptUtils { * the {@link InputStream} to wrap * @return the auto-encode {@link InputStream} */ - public InputStream encryptInputStream(InputStream in) { + public InputStream encrypt(InputStream in) { Cipher ecipher = newCipher(Cipher.ENCRYPT_MODE); return new CipherInputStream(in, ecipher); } + /** + * Wrap the given {@link InputStream} so it is transparently encrypted by + * the current {@link CryptUtils} and encoded in base64. + * + * @param in + * the {@link InputStream} to wrap + * + * @return the auto-encode {@link InputStream} + * + * @throws IOException + * in case of I/O error + */ + public InputStream encrypt64(InputStream in) throws IOException { + return new Base64InputStream(encrypt(in), true); + } + /** * Wrap the given {@link OutputStream} so it is transparently encrypted by * the current {@link CryptUtils}. * - * @param in + * @param out * the {@link OutputStream} to wrap + * * @return the auto-encode {@link OutputStream} */ - public OutputStream encryptOutpuStream(OutputStream out) { + public OutputStream encrypt(OutputStream out) { Cipher ecipher = newCipher(Cipher.ENCRYPT_MODE); return new CipherOutputStream(out, ecipher); } /** - * Wrap the given {@link OutStream} so it is transparently decoded by the + * Wrap the given {@link OutputStream} so it is transparently encrypted by + * the current {@link CryptUtils} and encoded in base64. + * + * @param out + * the {@link OutputStream} to wrap + * + * @return the auto-encode {@link OutputStream} + * + * @throws IOException + * in case of I/O error + */ + public OutputStream encrypt64(OutputStream out) throws IOException { + return encrypt(new Base64OutputStream(out, true)); + } + + /** + * Wrap the given {@link OutputStream} so it is transparently decoded by the * current {@link CryptUtils}. * * @param in * the {@link InputStream} to wrap + * * @return the auto-decode {@link InputStream} */ - public InputStream decryptInputStream(InputStream in) { + public InputStream decrypt(InputStream in) { Cipher dcipher = newCipher(Cipher.DECRYPT_MODE); return new CipherInputStream(in, dcipher); } /** - * Wrap the given {@link OutStream} so it is transparently decoded by the + * Wrap the given {@link OutputStream} so it is transparently decoded by the + * current {@link CryptUtils} and decoded from base64. + * + * @param in + * the {@link InputStream} to wrap + * + * @return the auto-decode {@link InputStream} + * + * @throws IOException + * in case of I/O error + */ + public InputStream decrypt64(InputStream in) throws IOException { + return decrypt(new Base64InputStream(in, false)); + } + + /** + * Wrap the given {@link OutputStream} so it is transparently decoded by the * current {@link CryptUtils}. * * @param out * the {@link OutputStream} to wrap * @return the auto-decode {@link OutputStream} */ - public OutputStream decryptOutputStream(OutputStream out) { + public OutputStream decrypt(OutputStream out) { Cipher dcipher = newCipher(Cipher.DECRYPT_MODE); return new CipherOutputStream(out, dcipher); } + /** + * Wrap the given {@link OutputStream} so it is transparently decoded by the + * current {@link CryptUtils} and decoded from base64. + * + * @param out + * the {@link OutputStream} to wrap + * + * @return the auto-decode {@link OutputStream} + * + * @throws IOException + * in case of I/O error + */ + public OutputStream decrypt64(OutputStream out) throws IOException { + return new Base64OutputStream(decrypt(out), false); + } + /** * This method required an array of 128 bytes. * @@ -142,11 +214,11 @@ 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); } - + /** * Create a new {@link Cipher}of the given mode (see * {@link Cipher#ENCRYPT_MODE} and {@link Cipher#ENCRYPT_MODE}). @@ -159,24 +231,20 @@ public class CryptUtils { */ private Cipher newCipher(int mode) { try { + // 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); + 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 + } catch (Exception e) { e.printStackTrace(); + throw new RuntimeException( + "Cannot initialize encryption sub-system", e); } - - return null; } /** @@ -216,13 +284,7 @@ public class CryptUtils { * it was) */ public byte[] encrypt(String data) throws SSLException { - try { - return encrypt(data.getBytes("UTF8")); - } catch (UnsupportedEncodingException e) { - // UTF-8 is required in all confirm JVMs - e.printStackTrace(); - return null; - } + return encrypt(StringUtils.getBytes(data)); } /** @@ -241,14 +303,8 @@ public class CryptUtils { * in case of I/O error (i.e., the data is not what you assumed * it was) */ - public String encrypt64(String data, boolean zip) throws SSLException { - try { - return encrypt64(data.getBytes("UTF8"), zip); - } catch (UnsupportedEncodingException e) { - // UTF-8 is required in all confirm JVMs - e.printStackTrace(); - return null; - } + public String encrypt64(String data) throws SSLException { + return encrypt64(StringUtils.getBytes(data)); } /** @@ -256,10 +312,6 @@ public class CryptUtils { * * @param data * the data to encrypt - * @param zip - * TRUE to also compress the data in GZIP format; remember that - * compressed and not-compressed content are different; you need - * to know which is which when decoding * * @return the encrypted data, encoded in Base64 * @@ -267,9 +319,9 @@ public class CryptUtils { * in case of I/O error (i.e., the data is not what you assumed * it was) */ - public String encrypt64(byte[] data, boolean zip) throws SSLException { + public String encrypt64(byte[] data) throws SSLException { try { - return StringUtils.base64(encrypt(data), zip); + return StringUtils.base64(encrypt(data)); } catch (IOException e) { // not exactly true, but we consider here that this error is a crypt // error, not a normal I/O error @@ -337,9 +389,9 @@ public class CryptUtils { * @throws SSLException * in case of I/O error */ - public byte[] decrypt64(String data, boolean zip) throws SSLException { + public byte[] decrypt64(String data) throws SSLException { try { - return decrypt(StringUtils.unbase64(data, zip)); + return decrypt(StringUtils.unbase64(data)); } catch (IOException e) { // not exactly true, but we consider here that this error is a crypt // error, not a normal I/O error @@ -363,9 +415,9 @@ public class CryptUtils { * @throws SSLException * in case of I/O error */ - public String decrypt64s(String data, boolean zip) throws SSLException { + public String decrypt64s(String data) throws SSLException { try { - return new String(decrypt(StringUtils.unbase64(data, zip)), "UTF-8"); + return new String(decrypt(StringUtils.unbase64(data)), "UTF-8"); } catch (UnsupportedEncodingException e) { // UTF-8 is required in all confirm JVMs e.printStackTrace();