git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server: re-introduce the client/server versions
[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 ed6f9e08a04cb623823863e5ded858ad6b6d9748..9ef91015ad14f0ecc5c3d45f3f242628160146cc 100644
(file)
--- a/
src/be/nikiroo/utils/CryptUtils.java
+++ b/
src/be/nikiroo/utils/CryptUtils.java
@@
-4,6
+4,7
@@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
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 java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
@@
-14,9
+15,13
@@
import javax.crypto.CipherOutputStream;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.SecretKey;
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;
import javax.crypto.spec.SecretKeySpec;
import javax.net.ssl.SSLException;
+import be.nikiroo.utils.streams.Base64InputStream;
+import be.nikiroo.utils.streams.Base64OutputStream;
+
/**
* Small utility class to do AES encryption/decryption.
* <p>
/**
* Small utility class to do AES encryption/decryption.
* <p>
@@
-31,14
+36,15
@@
import javax.net.ssl.SSLException;
* @author niki
*/
public class CryptUtils {
* @author niki
*/
public class CryptUtils {
- static private final String AES_NAME = "AES/
ECB/PKCS5
Padding";
-
+ static private final String AES_NAME = "AES/
CFB8/No
Padding";
+
private Cipher ecipher;
private Cipher dcipher;
private SecretKey key;
/**
private Cipher ecipher;
private Cipher dcipher;
private SecretKey key;
/**
- * 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}.
* <p>
* <b>Some</b> part of the key will be used to generate a 128 bits key and
* initialize the {@link CryptUtils}; even NULL will generate something.
* <p>
* <b>Some</b> 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}
*/
* the {@link InputStream} to wrap
* @return the auto-encode {@link InputStream}
*/
- public InputStream encrypt
InputStream
(InputStream in) {
+ public InputStream encrypt(InputStream in) {
Cipher ecipher = newCipher(Cipher.ENCRYPT_MODE);
return new CipherInputStream(in, ecipher);
}
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}.
*
/**
* Wrap the given {@link OutputStream} so it is transparently encrypted by
* the current {@link CryptUtils}.
*
- * @param
in
+ * @param
out
* the {@link OutputStream} to wrap
* the {@link OutputStream} to wrap
+ *
* @return the auto-encode {@link OutputStream}
*/
* @return the auto-encode {@link OutputStream}
*/
- public OutputStream encrypt
OutpuStream
(OutputStream out) {
+ public OutputStream encrypt(OutputStream out) {
Cipher ecipher = newCipher(Cipher.ENCRYPT_MODE);
return new CipherOutputStream(out, ecipher);
}
/**
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
* current {@link CryptUtils}.
*
* @param in
* the {@link InputStream} to wrap
+ *
* @return the auto-decode {@link InputStream}
*/
* @return the auto-decode {@link InputStream}
*/
- public InputStream decrypt
InputStream
(InputStream in) {
+ public InputStream decrypt(InputStream in) {
Cipher dcipher = newCipher(Cipher.DECRYPT_MODE);
return new CipherInputStream(in, dcipher);
}
/**
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}
*/
* current {@link CryptUtils}.
*
* @param out
* the {@link OutputStream} to wrap
* @return the auto-decode {@link OutputStream}
*/
- public OutputStream decrypt
OutputStream
(OutputStream out) {
+ public OutputStream decrypt(OutputStream out) {
Cipher dcipher = newCipher(Cipher.DECRYPT_MODE);
return new CipherOutputStream(out, dcipher);
}
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.
*
/**
* This method required an array of 128 bytes.
*
@@
-146,7
+218,7
@@
public class CryptUtils {
ecipher = newCipher(Cipher.ENCRYPT_MODE);
dcipher = newCipher(Cipher.DECRYPT_MODE);
}
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}).
/**
* Create a new {@link Cipher}of the given mode (see
* {@link Cipher#ENCRYPT_MODE} and {@link Cipher#ENCRYPT_MODE}).
@@
-159,8
+231,10
@@
public class CryptUtils {
*/
private Cipher newCipher(int mode) {
try {
*/
private Cipher newCipher(int mode) {
try {
+ byte[] iv = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+ IvParameterSpec ivspec = new IvParameterSpec(iv);
Cipher cipher = Cipher.getInstance(AES_NAME);
Cipher cipher = Cipher.getInstance(AES_NAME);
- cipher.init(mode, key);
+ cipher.init(mode, key
, ivspec
);
return cipher;
} catch (NoSuchAlgorithmException e) {
// Every implementation of the Java platform is required to support
return cipher;
} catch (NoSuchAlgorithmException e) {
// Every implementation of the Java platform is required to support
@@
-174,8
+248,11
@@
public class CryptUtils {
// Every implementation of the Java platform is required to support
// this standard Cipher transformation with 128 bits keys
e.printStackTrace();
// Every implementation of the Java platform is required to support
// this standard Cipher transformation with 128 bits keys
e.printStackTrace();
+ } catch (InvalidAlgorithmParameterException e) {
+ // Woops?
+ e.printStackTrace();
}
}
-
+
return null;
}
return null;
}
@@
-216,13
+293,7
@@
public class CryptUtils {
* it was)
*/
public byte[] encrypt(String data) throws SSLException {
* 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
+312,8
@@
public class CryptUtils {
* in case of I/O error (i.e., the data is not what you assumed
* it was)
*/
* 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
+321,6
@@
public class CryptUtils {
*
* @param data
* the data to encrypt
*
* @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
*
*
* @return the encrypted data, encoded in Base64
*
@@
-267,9
+328,9
@@
public class CryptUtils {
* in case of I/O error (i.e., the data is not what you assumed
* it was)
*/
* 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 {
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
} 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
+398,9
@@
public class CryptUtils {
* @throws SSLException
* in case of I/O error
*/
* @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 {
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
} 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
+424,9
@@
public class CryptUtils {
* @throws SSLException
* in case of I/O error
*/
* @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 {
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();
} catch (UnsupportedEncodingException e) {
// UTF-8 is required in all confirm JVMs
e.printStackTrace();