diff --git a/src/main/java/me/hatter/tools/tinyencrypt/TinyEncryptMain.java b/src/main/java/me/hatter/tools/tinyencrypt/TinyEncryptMain.java index 2b734b2..42865f0 100644 --- a/src/main/java/me/hatter/tools/tinyencrypt/TinyEncryptMain.java +++ b/src/main/java/me/hatter/tools/tinyencrypt/TinyEncryptMain.java @@ -199,7 +199,7 @@ public class TinyEncryptMain { if ((clearTextFile != null) && clearTextFile.exists()) { Bytes clearTextSha256 = RFile.from(clearTextFile).digest(Digests.sha256()); if (clearTextSha256.equals(sha256)) { - log.info("Clear text file exists, and matches."); + log.info("Clear text file exists, and MATCHES."); } else { String nfn = f.toString(); log.warn(clearTextSha256.asHex() + " - " + nfn.substring(0, nfn.length() - TinyEncryptConstant.ENC_FILE_EXT.length())); 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 09d3da7..b749fae 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.3.5"; + public static final String VERSION = "0.3.6"; 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 40644bc..a58fe13 100644 --- a/src/main/java/me/hatter/tools/tinyencrypt/encrypt/EncryptedFileUtil.java +++ b/src/main/java/me/hatter/tools/tinyencrypt/encrypt/EncryptedFileUtil.java @@ -26,6 +26,10 @@ public class EncryptedFileUtil { private static final LogTool log = LogTools.getLogTool(EncryptedFileUtil.class); public static boolean decryptToOutputStream(TinyEncryptConfig config, File file, OutputStream os) { + if (getDecryptFile(file) == null) { + log.warn("File is not tinyenc file, skip: " + file); + return false; + } try { try (FileInputStream fis = new FileInputStream(file)) { Tlv tlv = TlvUtil.readTlv(fis);