github/SpringBlade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
zhuangqian 2017-02-26 09:12:46 +08:00
parent 43029fbcd4
commit 69f500f6d0
2 changed files with 1080 additions and 1068 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/smallchill/core/toolbox/kit/AESKit.java
View File

@ -19,14 +19,19 @@ public class AESKit {
/** /**
* 加密 * 加密
* @param content 需要加密的内容 *
* @param password 加密密码 * @param content
* 需要加密的内容
* @param password
* 加密密码
* @return * @return
*/ */
private static byte[] encryptByte(String content, String password) { private static byte[] encryptByte(String content, String password) {
try { try {
KeyGenerator kgen = KeyGenerator.getInstance("AES"); KeyGenerator kgen = KeyGenerator.getInstance("AES");
kgen.init(128, new SecureRandom(password.getBytes())); SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
secureRandom.setSeed(password.getBytes());
kgen.init(128, secureRandom);
SecretKey secretKey = kgen.generateKey(); SecretKey secretKey = kgen.generateKey();
byte[] enCodeFormat = secretKey.getEncoded(); byte[] enCodeFormat = secretKey.getEncoded();
SecretKeySpec key = new SecretKeySpec(enCodeFormat, "AES"); SecretKeySpec key = new SecretKeySpec(enCodeFormat, "AES");
@ -53,14 +58,19 @@ public class AESKit {
/** /**
* 解密 * 解密
* @param content 待解密内容 *
* @param password 解密密钥 * @param content
* 待解密内容
* @param password
* 解密密钥
* @return * @return
*/ */
private static byte[] decryptByte(byte[] content, String password) { private static byte[] decryptByte(byte[] content, String password) {
try { try {
KeyGenerator kgen = KeyGenerator.getInstance("AES"); KeyGenerator kgen = KeyGenerator.getInstance("AES");
kgen.init(128, new SecureRandom(password.getBytes())); SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
secureRandom.setSeed(password.getBytes());
kgen.init(128, secureRandom);
SecretKey secretKey = kgen.generateKey(); SecretKey secretKey = kgen.generateKey();
byte[] enCodeFormat = secretKey.getEncoded(); byte[] enCodeFormat = secretKey.getEncoded();
SecretKeySpec key = new SecretKeySpec(enCodeFormat, "AES"); SecretKeySpec key = new SecretKeySpec(enCodeFormat, "AES");
@ -84,6 +94,7 @@ public class AESKit {
/** /**
* AES加密 * AES加密
*
* @param str * @param str
* @return * @return
*/ */
@ -93,6 +104,7 @@ public class AESKit {
/** /**
* AES解密 * AES解密
*
* @param str * @param str
* @return * @return
*/ */

2124
src/main/java/com/smallchill/core/toolbox/support/Convert.java
View File

File diff suppressed because it is too large Load Diff