moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:修改加密方案（换so方式）

Browse Source 
feat:调整混淆配置
feat:补充部分场景log
This commit is contained in:
Max
2023-12-04 13:34:36 +08:00
parent 62c5aa8bd8
commit e14f76cb47
20 changed files with 134 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/build.gradle
View File

@@ -44,7 +44,6 @@ android {
'src/module_common/res',
]
}
}
@@ -120,6 +119,7 @@ dependencies {
api project(':libs:lib_utils')
api project(':libs:lib_core')
api project(':libs:lib_encrypt')
}
repositories {
mavenCentral()

128
library/src/main/java/com/chwl/library/utils/codec/DESUtils.java
View File

@@ -1,83 +1,15 @@
package com.chwl.library.utils.codec;
import android.util.Base64;
import com.chwl.library.utils.StringUtils;
import java.nio.charset.Charset;
import java.security.Key;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.crypto.Cipher;
import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.DESKeySpec;
//import sun.misc.BASE64Decoder;
//import sun.misc.BASE64Encoder;
import com.example.lib_encrypt.EncryptLib;
public class DESUtils {
// static BASE64Decoder decoder = new BASE64Decoder();
// static BASE64Encoder encoder = new BASE64Encoder();
static String DES = "DES";
static String ENCODE = "UTF-8";//保持平台兼容统一使用utf-8
//des 加密
private static byte[] encryptByteDES(byte[] byteD, String strKey) throws Exception {
return doEncrypt(byteD, getKey(strKey), DES);
}
//des 解密
private static byte[] decryptByteDES(byte[] byteD, String strKey) throws Exception {
return doDecrypt(byteD, getKey(strKey), DES);
}
public static SecretKey getKey(String strKey) throws Exception {
DESKeySpec desKeySpec = new DESKeySpec(strKey.getBytes());
SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(DES);
SecretKey sk = keyFactory.generateSecret(desKeySpec);
return sk;
}
public static void main(String[] args) throws Exception {
String text = "admin";
// String pwd = "NJD783iSDK0d9fjd98KKDf9O";
String pwd = "1ea53d260ecf11e7b56e00163e046a26";
//客户端加密
// String data = DESAndBase64Encrypt(text, pwd);
// System.out.println(ResUtil.getString(R.string.utils_codec_desutils_01) + URLEncoder.encode(data, "UTF-8"));
//服务端解密
// String textDecrypt = DESAndBase64Decrypt(data, pwd);
// System.out.println(ResUtil.getString(R.string.utils_codec_desutils_02) + text);
// System.out.println(ResUtil.getString(R.string.utils_codec_desutils_03) + textDecrypt);
// byte[] bytes = text.getBytes();
// byte[] encode = Base64.encode(bytes,Base64.DEFAULT);
}
//客户端加密
public static String DESAndBase64Encrypt(String dataToEncrypt, String secretKey) throws Exception {
byte[] encryptData = encryptByteDES(dataToEncrypt.getBytes(ENCODE), secretKey);//这里加密前不要处理加密数据的空格换行等事情
byte[] encode = Base64.encode(encryptData, Base64.DEFAULT);
String dataBase64 = StringUtils.toEncodedString(encode, Charset.defaultCharset());
return replaceBlank(dataBase64);
}
//客户端加密
public static String DESAndBase64Encrypt(String dataToEncypt) throws Exception {
byte[] encryptData = encryptByteDES(replaceBlank(dataToEncypt).getBytes(ENCODE), "1ea53d260ecf11e7b56e00163e046a26");
byte[] encode = Base64.encode(encryptData, Base64.DEFAULT);
String dataBase64 = StringUtils.toEncodedString(encode, Charset.defaultCharset());
return replaceBlank(dataBase64);
public static String DESAndBase64Encrypt(String dataToEncrypt) throws Exception {
return EncryptLib.INSTANCE.encryptTextDef1(dataToEncrypt);
}
public static String DESAndBase64(String psw) {
@@ -90,62 +22,16 @@ public class DESUtils {
return pwd;
}
public static String replaceBlank(String str) {
String dest = "";
if (str != null) {
Pattern p = Pattern.compile("\\s*|\t|\r|\n");
Matcher m = p.matcher(str);
dest = m.replaceAll("");
}
return dest;
}
//服务端解密
public static String DESAndBase64Decrypt(String dataBase64) throws Exception {
if (StringUtils.isEmpty(dataBase64)) return null;
byte[] encryptedData = Base64.decode(dataBase64, Base64.DEFAULT);
byte[] decryptedData = decryptByteDES(encryptedData, "1ea53d260ecf11e7b56e00163e046a26");
String textDecrypt = new String(decryptedData, ENCODE);
return textDecrypt;
return EncryptLib.INSTANCE.decryptTextDef1(dataBase64);
}
//服务端解密
public static String DESAndBase64Decrypt(String key,String dataBase64) throws Exception {
//解密
public static String decryptDef2(String dataBase64) throws Exception {
if (StringUtils.isEmpty(dataBase64)) return null;
byte[] encryptedData = Base64.decode(dataBase64, Base64.DEFAULT);
byte[] decryptedData = decryptByteDES(encryptedData, key);
String textDecrypt = new String(decryptedData, ENCODE);
return textDecrypt;
}
/**
* 执行加密操作
*
* @param data 待操作数据
* @param key Key
* @param type 算法 RSA or DES
* @return
* @throws Exception
*/
private static byte[] doEncrypt(byte[] data, Key key, String type) throws Exception {
Cipher cipher = Cipher.getInstance(type);
cipher.init(Cipher.ENCRYPT_MODE, key);
return cipher.doFinal(data);
}
/**
* 执行解密操作
*
* @param data 待操作数据
* @param key Key
* @param type 算法 RSA or DES
* @return
* @throws Exception
*/
private static byte[] doDecrypt(byte[] data, Key key, String type) throws Exception {
Cipher cipher = Cipher.getInstance(type);
cipher.init(Cipher.DECRYPT_MODE, key);
return cipher.doFinal(data);
return EncryptLib.INSTANCE.decryptTextDef2(dataBase64);
}
}