X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FCryptUtils.java;h=ed6f9e08a04cb623823863e5ded858ad6b6d9748;hb=6ef54b36380b9d123bbdb6b4056cf64b7489225e;hp=d5413d7c392f6856405b3b25e0fcab989ff4de68;hpb=9fb03c36d7d48a3009e3a83b6cd14fe2a8eea1ad;p=fanfix.git diff --git a/src/be/nikiroo/utils/CryptUtils.java b/src/be/nikiroo/utils/CryptUtils.java index d5413d7..ed6f9e0 100644 --- a/src/be/nikiroo/utils/CryptUtils.java +++ b/src/be/nikiroo/utils/CryptUtils.java @@ -1,12 +1,16 @@ package be.nikiroo.utils; import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.io.UnsupportedEncodingException; 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; @@ -16,16 +20,25 @@ import javax.net.ssl.SSLException; /** * Small utility class to do AES encryption/decryption. *

+ * For the moment, it is multi-thread compatible, but beware: + *

+ *

* Do not assume it is actually secure until you checked the code... * * @author niki */ public class CryptUtils { + static private final String AES_NAME = "AES/ECB/PKCS5Padding"; + private Cipher ecipher; private Cipher dcipher; + private SecretKey key; /** - * Small and leazy 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. @@ -60,6 +73,58 @@ public class CryptUtils { init(bytes32); } + /** + * Wrap the given {@link InputStream} so it is transparently encrypted by + * the current {@link CryptUtils}. + * + * @param in + * the {@link InputStream} to wrap + * @return the auto-encode {@link InputStream} + */ + public InputStream encryptInputStream(InputStream in) { + Cipher ecipher = newCipher(Cipher.ENCRYPT_MODE); + return new CipherInputStream(in, ecipher); + } + + /** + * Wrap the given {@link OutputStream} so it is transparently encrypted by + * the current {@link CryptUtils}. + * + * @param in + * the {@link OutputStream} to wrap + * @return the auto-encode {@link OutputStream} + */ + public OutputStream encryptOutpuStream(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 + * current {@link CryptUtils}. + * + * @param in + * the {@link InputStream} to wrap + * @return the auto-decode {@link InputStream} + */ + public InputStream decryptInputStream(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 + * current {@link CryptUtils}. + * + * @param out + * the {@link OutputStream} to wrap + * @return the auto-decode {@link OutputStream} + */ + public OutputStream decryptOutputStream(OutputStream out) { + Cipher dcipher = newCipher(Cipher.DECRYPT_MODE); + return new CipherOutputStream(out, dcipher); + } + /** * This method required an array of 128 bytes. * @@ -77,12 +142,26 @@ public class CryptUtils { + " bytes"); } - SecretKey key = new SecretKeySpec(bytes32, "AES"); + key = new SecretKeySpec(bytes32, "AES"); + ecipher = newCipher(Cipher.ENCRYPT_MODE); + dcipher = newCipher(Cipher.DECRYPT_MODE); + } + + /** + * Create a new {@link Cipher}of the given mode (see + * {@link Cipher#ENCRYPT_MODE} and {@link Cipher#ENCRYPT_MODE}). + * + * @param mode + * the mode ({@link Cipher#ENCRYPT_MODE} or + * {@link Cipher#ENCRYPT_MODE}) + * + * @return the new {@link Cipher} + */ + private Cipher newCipher(int mode) { try { - ecipher = Cipher.getInstance("AES/ECB/PKCS5Padding"); - dcipher = Cipher.getInstance("AES/ECB/PKCS5Padding"); - ecipher.init(Cipher.ENCRYPT_MODE, key); - dcipher.init(Cipher.DECRYPT_MODE, key); + Cipher cipher = Cipher.getInstance(AES_NAME); + cipher.init(mode, key); + return cipher; } catch (NoSuchAlgorithmException e) { // Every implementation of the Java platform is required to support // this standard Cipher transformation with 128 bits keys @@ -96,6 +175,8 @@ public class CryptUtils { // this standard Cipher transformation with 128 bits keys e.printStackTrace(); } + + return null; } /** @@ -111,12 +192,14 @@ public class CryptUtils { * it was) */ public byte[] encrypt(byte[] data) throws SSLException { - try { - return ecipher.doFinal(data); - } catch (IllegalBlockSizeException e) { - throw new SSLException(e); - } catch (BadPaddingException e) { - throw new SSLException(e); + synchronized (ecipher) { + try { + return ecipher.doFinal(data); + } catch (IllegalBlockSizeException e) { + throw new SSLException(e); + } catch (BadPaddingException e) { + throw new SSLException(e); + } } } @@ -206,12 +289,36 @@ public class CryptUtils { * in case of I/O error */ public byte[] decrypt(byte[] data) throws SSLException { + synchronized (dcipher) { + try { + return dcipher.doFinal(data); + } catch (IllegalBlockSizeException e) { + throw new SSLException(e); + } catch (BadPaddingException e) { + throw new SSLException(e); + } + } + } + + /** + * Decode the data which is assumed to be encrypted with the same utilities + * and to be a {@link String}. + * + * @param data + * the encrypted data to decode + * + * @return the original, decoded data,as a {@link String} + * + * @throws SSLException + * in case of I/O error + */ + public String decrypts(byte[] data) throws SSLException { try { - return dcipher.doFinal(data); - } catch (IllegalBlockSizeException e) { - throw new SSLException(e); - } catch (BadPaddingException e) { - throw new SSLException(e); + return new String(decrypt(data), "UTF-8"); + } catch (UnsupportedEncodingException e) { + // UTF-8 is required in all confirm JVMs + e.printStackTrace(); + return null; } } @@ -279,6 +386,6 @@ public class CryptUtils { * @return a 128 bits key computed from the given input */ static private byte[] key2key(String input) { - return StringUtils.getMd5Hash(input).getBytes(); + return StringUtils.getMd5Hash("" + input).getBytes(); } }