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
Improve ImageUtilsAndroid and ImageUtils check() system
[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 ba9e7002adacabefa1bf9397934e9637bf73ffe8..f024f2a65482d008ec77a3d762a4632679b37bee 100644
(file)
--- a/
src/be/nikiroo/utils/CryptUtils.java
+++ b/
src/be/nikiroo/utils/CryptUtils.java
@@
-11,7
+11,6
@@
import javax.crypto.Cipher;
import javax.crypto.CipherInputStream;
import javax.crypto.CipherOutputStream;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.CipherInputStream;
import javax.crypto.CipherOutputStream;
import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.SecretKey;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import javax.net.ssl.SSLException;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import javax.net.ssl.SSLException;
@@
-41,7
+40,7
@@
public class CryptUtils {
private Cipher ecipher;
private Cipher dcipher;
private Cipher ecipher;
private Cipher dcipher;
- private
SecretKey key
;
+ private
byte[] bytes32
;
/**
* Small and lazy-easy way to initialize a 128 bits key with
/**
* Small and lazy-easy way to initialize a 128 bits key with
@@
-215,9
+214,9
@@
public class CryptUtils {
+ " bytes");
}
+ " 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);
}
/**
}
/**
@@
-232,10
+231,14
@@
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 };
+ // 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);
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 (Exception e) {
e.printStackTrace();
return cipher;
} catch (Exception e) {
e.printStackTrace();