X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FCryptUtils.java;h=681692a00e6323531b1dae680bf5d0b774c8190a;hb=272f5c86957c3caf4b3ed7d59448573914b7b33f;hp=ea6892babd0a8c355c8182c364655e7493ea3ac0;hpb=52e0732e1f06ddff5d69c0588bdbd937fcc52537;p=fanfix.git diff --git a/src/be/nikiroo/utils/CryptUtils.java b/src/be/nikiroo/utils/CryptUtils.java index ea6892b..681692a 100644 --- a/src/be/nikiroo/utils/CryptUtils.java +++ b/src/be/nikiroo/utils/CryptUtils.java @@ -1,15 +1,21 @@ 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; import javax.crypto.spec.SecretKeySpec; +import javax.net.ssl.SSLException; /** * Small utility class to do AES encryption/decryption. @@ -36,7 +42,11 @@ public class CryptUtils { */ public CryptUtils(String key) { try { - init(key2key(key)); + byte[] bytes32 = key2key(key); + init(bytes32); + for (int i = 0 ; i < bytes32.length ; i++) { + bytes32[i] = 0; + } } catch (InvalidKeyException e) { // We made sure that the key is correct, so nothing here e.printStackTrace(); @@ -56,6 +66,57 @@ public class CryptUtils { */ public CryptUtils(byte[] bytes32) throws InvalidKeyException { init(bytes32); + for (int i = 0 ; i < bytes32.length ; i++) { + bytes32[i] = 0; + } + } + + /** + * 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) { + 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) { + 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) { + 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) { + return new CipherOutputStream(out, dcipher); } /** @@ -104,17 +165,17 @@ public class CryptUtils { * * @return the encrypted data * - * @throws IOException + * @throws SSLException * in case of I/O error (i.e., the data is not what you assumed * it was) */ - public byte[] encrypt(byte[] data) throws IOException { + public byte[] encrypt(byte[] data) throws SSLException { try { return ecipher.doFinal(data); } catch (IllegalBlockSizeException e) { - throw new IOException(e); + throw new SSLException(e); } catch (BadPaddingException e) { - throw new IOException(e); + throw new SSLException(e); } } @@ -126,12 +187,18 @@ public class CryptUtils { * * @return the encrypted data * - * @throws IOException + * @throws SSLException * in case of I/O error (i.e., the data is not what you assumed * it was) */ - public byte[] encrypt(String data) throws IOException { - return encrypt(data.getBytes("UTF8")); + 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; + } } /** @@ -146,12 +213,18 @@ public class CryptUtils { * * @return the encrypted data, encoded in Base64 * - * @throws IOException + * @throws SSLException * 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 IOException { - return encrypt64(data.getBytes("UTF8"), zip); + 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; + } } /** @@ -166,12 +239,18 @@ public class CryptUtils { * * @return the encrypted data, encoded in Base64 * - * @throws IOException + * @throws SSLException * 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 IOException { - return StringUtils.base64(encrypt(data), zip); + public String encrypt64(byte[] data, boolean zip) throws SSLException { + try { + return StringUtils.base64(encrypt(data), zip); + } catch (IOException e) { + // not exactly true, but we consider here that this error is a crypt + // error, not a normal I/O error + throw new SSLException(e); + } } /** @@ -182,16 +261,38 @@ public class CryptUtils { * * @return the original, decoded data * - * @throws IOException + * @throws SSLException * in case of I/O error */ - public byte[] decrypt(byte[] data) throws IOException { + public byte[] decrypt(byte[] data) throws SSLException { try { return dcipher.doFinal(data); } catch (IllegalBlockSizeException e) { - throw new IOException(e); + throw new SSLException(e); } catch (BadPaddingException e) { - throw new IOException(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 new String(decrypt(data), "UTF-8"); + } catch (UnsupportedEncodingException e) { + // UTF-8 is required in all confirm JVMs + e.printStackTrace(); + return null; } } @@ -207,11 +308,17 @@ public class CryptUtils { * * @return the original, decoded data * - * @throws IOException + * @throws SSLException * in case of I/O error */ - public byte[] decrypt64(String data, boolean zip) throws IOException { - return decrypt(StringUtils.unbase64(data, zip)); + public byte[] decrypt64(String data, boolean zip) throws SSLException { + try { + return decrypt(StringUtils.unbase64(data, zip)); + } catch (IOException e) { + // not exactly true, but we consider here that this error is a crypt + // error, not a normal I/O error + throw new SSLException(e); + } } /** @@ -227,11 +334,21 @@ public class CryptUtils { * * @return the original, decoded data * - * @throws IOException + * @throws SSLException * in case of I/O error */ - public String decrypt64s(String data, boolean zip) throws IOException { - return new String(decrypt(StringUtils.unbase64(data, zip)), "UTF-8"); + public String decrypt64s(String data, boolean zip) throws SSLException { + try { + return new String(decrypt(StringUtils.unbase64(data, zip)), "UTF-8"); + } catch (UnsupportedEncodingException e) { + // UTF-8 is required in all confirm JVMs + e.printStackTrace(); + return null; + } catch (IOException e) { + // not exactly true, but we consider here that this error is a crypt + // error, not a normal I/O error + throw new SSLException(e); + } } /** @@ -243,6 +360,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(); } }