Skip to content

Commit

Permalink
代码优化
Browse files Browse the repository at this point in the history
  • Loading branch information
赵栩彬 committed Nov 22, 2019
1 parent 5bfd920 commit 9404b1f
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 147 deletions.
6 changes: 3 additions & 3 deletions src/main/java/site/yan/key/cmds/Show.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ private static void parse(String regex) {
}
}
System.out.println();
if (list.size() == 0) System.out.println("未找到相关密钥 :|");
else if (list.size() == 1) {
if (count == 0) System.out.println("未找到相关密钥 :|");
else if (count == 1) {
Utils.setClipboardString(passwordList.get(0));
Utils.tell("密钥已拷贝到粘贴板", true, true);
} else {
Expand All @@ -77,7 +77,7 @@ else if (list.size() == 1) {
Utils.tell("编号超出范围", false, true);
} else {
Utils.setClipboardString(passwordList.get(orderNum - 1));

Utils.tell("拷贝成功", true, true);
}
}
}
Expand Down
137 changes: 7 additions & 130 deletions src/main/java/site/yan/key/securtiy/AesCore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,52 +12,29 @@
*/
public class AesCore {

//偏移量
public static final String VIPARA = "1234567876543210"; //AES 为16bytes. DES 为8bytes

//编码方式
public static final String VIPARA = "1234567876543210";
public static final String CODE_TYPE = "UTF-8";
//public static final String CODE_TYPE = "GBK";

//填充类型
public static final String AES_TYPE = "AES/ECB/PKCS5Padding";
//public static final String AES_TYPE = "AES/ECB/PKCS7Padding";
//此类型 加密内容,密钥必须为16字节的倍数位,否则抛异常,需要字节补全再进行加密
//public static final String AES_TYPE = "AES/ECB/NoPadding";
//java 不支持ZeroPadding
//public static final String AES_TYPE = "AES/CBC/ZeroPadding";

//密钥
private static String AES_KEY="81dc9bdb52d04dc20036dbd8"; //AES固定格式为128/192/256 bits.即：16/24/32bytes。DES固定格式为128bits，即8bytes。

//字符补全
private static String AES_KEY="81dc9bdb52d04dc20036dbd8";
private static final String[] consult = new String[]{"0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F","G"};


public static void setAesKey(String aesKey) {
AES_KEY = aesKey;
}

/**
* 加密
*
* @param cleartext
* @return
*/
public static String encrypt(String cleartext) {
//加密方式： AES128(CBC/PKCS5Padding) + Base64, 私钥：1111222233334444

try {
IvParameterSpec zeroIv = new IvParameterSpec(VIPARA.getBytes());
//两个参数，第一个为私钥字节数组， 第二个为加密方式 AES或者DES
SecretKeySpec key = new SecretKeySpec(AES_KEY.getBytes(), "AES");
//实例化加密类，参数为加密方式，要写全
Cipher cipher = Cipher.getInstance(AES_TYPE); //PKCS5Padding比PKCS7Padding效率高，PKCS7Padding可支持IOS加解密
//初始化，此方法可以采用三种方式，按加密算法要求来添加。（1）无第三个参数（2）第三个参数为SecureRandom random = new SecureRandom();中random对象，随机数。(AES不可采用这种方法)（3）采用此代码中的IVParameterSpec
//加密时使用:ENCRYPT_MODE; 解密时使用:DECRYPT_MODE;
cipher.init(Cipher.ENCRYPT_MODE, key); //CBC类型的可以在第三个参数传递偏移量zeroIv,ECB没有偏移量
//加密操作,返回加密后的字节数组，然后需要编码。主要编解码方式有Base64, HEX, UUE,7bit等等。此处看服务器需要什么编码方式
Cipher cipher = Cipher.getInstance(AES_TYPE);
cipher.init(Cipher.ENCRYPT_MODE, key);
byte[] encryptedData = cipher.doFinal(cleartext.getBytes(CODE_TYPE));

return new BASE64Encoder().encode(encryptedData);
} catch (Exception e) {
e.printStackTrace();
Expand All @@ -75,114 +52,14 @@ public static String decrypt(String encrypted) {
try {
byte[] byteMi = new BASE64Decoder().decodeBuffer(encrypted);
IvParameterSpec zeroIv = new IvParameterSpec(VIPARA.getBytes());
SecretKeySpec key = new SecretKeySpec(
AES_KEY.getBytes(), "AES");
SecretKeySpec key = new SecretKeySpec(AES_KEY.getBytes(), "AES");
Cipher cipher = Cipher.getInstance(AES_TYPE);
//与加密时不同MODE:Cipher.DECRYPT_MODE
cipher.init(Cipher.DECRYPT_MODE, key); //CBC类型的可以在第三个参数传递偏移量zeroIv,ECB没有偏移量
cipher.init(Cipher.DECRYPT_MODE, key);
byte[] decryptedData = cipher.doFinal(byteMi);
return new String(decryptedData, CODE_TYPE);
} catch (Exception e) {
e.printStackTrace();
return "";
}
}

/**
* 测试
*
* @param args
* @throws Exception
*/
public static void main(String[] args) throws Exception {
String content = "你笑起来真好看";
test(content);
}

public static void test(String content) throws UnsupportedEncodingException{
System.out.println("加密内容：" + content);
//字节数
int num = content.getBytes(CODE_TYPE).length;
System.out.println("加密内容字节数: " + num);
System.out.println("加密内容是否16倍数: " + (num%16 == 0 ? true : false));

//字节补全
if(AES_TYPE.equals("AES/ECB/NoPadding")){
System.out.println();
content = completionCodeFor16Bytes(content);
System.out.println("加密内容补全后: "+content);
}

System.out.println();

// 加密
String encryptResult = encrypt(content);
content = new String(encryptResult);
System.out.println("加密后：" + content);

System.out.println();

// 解密
String decryptResult = decrypt(encryptResult);
content = new String(decryptResult);
//还原
if(AES_TYPE.equals("AES/ECB/NoPadding")){
System.out.println("解密内容还原前: "+content);
content = resumeCodeOf16Bytes(content);
}

System.out.println("解密完成后：" + content);
}




//NoPadding
//补全字符
public static String completionCodeFor16Bytes(String str) throws UnsupportedEncodingException{
int num = str.getBytes(CODE_TYPE).length;
int index = num%16;
//进行加密内容补全操作, 加密内容应该为 16字节的倍数, 当不足16*n字节是进行补全, 差一位时 补全16+1位
//补全字符 以 $ 开始,$后一位代表$后补全字符位数,之后全部以0进行补全;
if(index != 0){
StringBuffer sbBuffer = new StringBuffer(str);
if(16-index == 1){
sbBuffer.append("$" + consult[16-1] + addStr(16-1-1));
}else{
sbBuffer.append("$" + consult[16-index-1] + addStr(16-index-1-1));
}
str = sbBuffer.toString();
}
return str;
}

//追加字符
public static String addStr(int num){
StringBuffer sbBuffer = new StringBuffer("");
for (int i = 0; i < num; i++) {
sbBuffer.append("0");
}
return sbBuffer.toString();
}


//还原字符(进行字符判断)
public static String resumeCodeOf16Bytes(String str){
int indexOf = str.lastIndexOf("$");
if(indexOf == -1){
return str;
}
String trim = str.substring(indexOf+1,indexOf+2).trim();
int num = 0;
for (int i = 0; i < consult.length; i++) {
if(trim.equals(consult[i])){
num = i;
}
}
if(num == 0){
return str;
}
return str.substring(0,indexOf).trim();
}

}
18 changes: 5 additions & 13 deletions src/main/java/site/yan/key/securtiy/MD5Core.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,9 @@
public class MD5Core {
public static String getMD5(String plainText) {
try {
MessageDigest md = MessageDigest.getInstance("MD5");//获取MD5实例
md.update(plainText.getBytes());//此处传入要加密的byte类型值
byte[] digest = md.digest();//此处得到的是md5加密后的byte类型值

/*
下边的运算就是自己添加的一些二次小加密，记住这个千万不能弄错乱，
否则在解密的时候，你会发现值不对的（举例：在注册的时候加密方式是一种，
在我们登录的时候是不是还需要加密它的密码然后和数据库的进行比对，但是
最后我们发现，明明密码对啊，就是打不到预期效果，这时候你就要想一下，你是否
有改动前后的加密方式）
*/
MessageDigest md = MessageDigest.getInstance("MD5");
md.update(plainText.getBytes());
byte[] digest = md.digest();
int i;
StringBuilder sb = new StringBuilder();
for (int offset = 0; offset < digest.length; offset++) {
Expand All @@ -28,9 +20,9 @@ public static String getMD5(String plainText) {
i += 256;
if (i < 16)
sb.append(0);
sb.append(Integer.toHexString(i));//通过Integer.toHexString方法把值变为16进制
sb.append(Integer.toHexString(i));
}
return sb.toString().substring(0, 24);//从下标0开始，length目的是截取多少长度的值
return sb.toString().substring(0, 24);
} catch (NoSuchAlgorithmException e) {
e.printStackTrace();
return null;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/site/yan/key/securtiy/Secrey.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class Secrey {
public static void checkHasPin() {
File file = new File(SECRET_PIN);
if (!file.exists()) {
System.out.print("欢迎使用由言言技术中心研发yank密钥管理工具\n" +
System.out.print("欢迎使用由言言技术中心研发yank密钥管理工具\n\n" +
"首次使用请设置4位PIN码：");
String pin = new String(System.console().readPassword());
if (!pin.matches("\\d{4}")) {
Expand Down

0 comments on commit 9404b1f

Please sign in to comment.