add time in default trace handler

[fanfix.git] / src / be / nikiroo / utils / CryptUtils.java

diff --git a/src/be/nikiroo/utils/CryptUtils.java b/src/be/nikiroo/utils/CryptUtils.java
index 72c9c44b449a5e0ef782cb560dfe044c0c6e8840..f024f2a65482d008ec77a3d762a4632679b37bee 100644 (file)
--- 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;
@@ -31,16 +27,20 @@ import be.nikiroo.utils.streams.Base64OutputStream;
  * <li>The streams are independent and thus parallel</li>
  * </ul>
  * <p>
- * Do not assume it is actually secure until you checked the code...
+ * 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).
  * 
  * @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
@@ -214,9 +214,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 +231,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;
        }
 
        /**
@@ -293,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));
        }
 
        /**
@@ -319,13 +304,7 @@ public class CryptUtils {
         *             it was)
         */
        public String encrypt64(String data) throws SSLException {
-               try {
-                       return encrypt64(data.getBytes("UTF8"));
-               } catch (UnsupportedEncodingException e) {
-                       // UTF-8 is required in all confirm JVMs
-                       e.printStackTrace();
-                       return null;
-               }
+               return encrypt64(StringUtils.getBytes(data));
        }
 
        /**