From 31ff41e860ed0852d4f8587574db026e91d53ce9 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Fri, 16 Apr 2021 22:33:33 +0800 Subject: [PATCH] v0.2.1 --- build.json | 3 +-- .../hatter/tools/tinyencrypt/TinyEncryptMain.java | 3 --- .../tinyencrypt/config/TinyEncryptConstant.java | 2 +- .../tinyencrypt/encrypt/EncryptedFileUtil.java | 5 ----- .../me/hatter/tools/tinyencrypt/util/BCUtil.java | 14 -------------- 5 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 src/main/java/me/hatter/tools/tinyencrypt/util/BCUtil.java diff --git a/build.json b/build.json index 0012857..a6cb2ca 100644 --- a/build.json +++ b/build.json @@ -12,8 +12,7 @@ }, "repo": { "dependencies": [ - "me.hatter:commons:3.33", - "org.bouncycastle:bcprov-jdk15on:1.62", + "me.hatter:commons:3.34", "info.picocli:picocli:4.6.1" ], "testDependencies": [ diff --git a/src/main/java/me/hatter/tools/tinyencrypt/TinyEncryptMain.java b/src/main/java/me/hatter/tools/tinyencrypt/TinyEncryptMain.java index 4602f2e..90287e3 100644 --- a/src/main/java/me/hatter/tools/tinyencrypt/TinyEncryptMain.java +++ b/src/main/java/me/hatter/tools/tinyencrypt/TinyEncryptMain.java @@ -16,12 +16,10 @@ import me.hatter.tools.tinyencrypt.config.TinyEncryptConfig; import me.hatter.tools.tinyencrypt.config.TinyEncryptConstant; import me.hatter.tools.tinyencrypt.encrypt.EncryptedFileUtil; import me.hatter.tools.tinyencrypt.encrypt.TinyEncryptMeta; -import me.hatter.tools.tinyencrypt.util.BCUtil; import picocli.CommandLine; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.security.KeyPair; import java.util.Date; @@ -30,7 +28,6 @@ public class TinyEncryptMain { private static final LogTool log; static { - BCUtil.init(); LogConfig.initMuteInfoMode(); log = LogTools.getLogTool(TinyEncryptMain.class); } diff --git a/src/main/java/me/hatter/tools/tinyencrypt/config/TinyEncryptConstant.java b/src/main/java/me/hatter/tools/tinyencrypt/config/TinyEncryptConstant.java index eeaf62b..7e7c230 100644 --- a/src/main/java/me/hatter/tools/tinyencrypt/config/TinyEncryptConstant.java +++ b/src/main/java/me/hatter/tools/tinyencrypt/config/TinyEncryptConstant.java @@ -1,7 +1,7 @@ package me.hatter.tools.tinyencrypt.config; public class TinyEncryptConstant { - public static final String VERSION = "0.2.0"; + public static final String VERSION = "0.2.1"; public static final String ENC_FILE_EXT = ".tinyenc"; } diff --git a/src/main/java/me/hatter/tools/tinyencrypt/encrypt/EncryptedFileUtil.java b/src/main/java/me/hatter/tools/tinyencrypt/encrypt/EncryptedFileUtil.java index bd12490..925e86b 100644 --- a/src/main/java/me/hatter/tools/tinyencrypt/encrypt/EncryptedFileUtil.java +++ b/src/main/java/me/hatter/tools/tinyencrypt/encrypt/EncryptedFileUtil.java @@ -10,17 +10,12 @@ import me.hatter.tools.commons.tlv.Tlv; import me.hatter.tools.commons.tlv.TlvUtil; import me.hatter.tools.tinyencrypt.config.TinyEncryptConfig; import me.hatter.tools.tinyencrypt.config.TinyEncryptConstant; -import me.hatter.tools.tinyencrypt.util.BCUtil; import java.io.*; public class EncryptedFileUtil { private static final LogTool log = LogTools.getLogTool(EncryptedFileUtil.class); - static { - BCUtil.init(); - } - public static boolean decryptFile(TinyEncryptConfig config, File file) { File decFile = getDecryptFile(file); if (decFile == null) { diff --git a/src/main/java/me/hatter/tools/tinyencrypt/util/BCUtil.java b/src/main/java/me/hatter/tools/tinyencrypt/util/BCUtil.java deleted file mode 100644 index 1b0353b..0000000 --- a/src/main/java/me/hatter/tools/tinyencrypt/util/BCUtil.java +++ /dev/null @@ -1,14 +0,0 @@ -package me.hatter.tools.tinyencrypt.util; - -import org.bouncycastle.jce.provider.BouncyCastleProvider; - -import java.security.Security; - -public class BCUtil { - static { - Security.addProvider(new BouncyCastleProvider()); - } - - public static void init() { - } -}