From 3ca429af58b01ba38168cb676f00434d70551292 Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 5 May 2022 13:55:26 +0800 Subject: [PATCH] add methods --- .../cn/hutool/crypto/digest/DigestUtil.java | 105 ++++++++++++++++++ .../hutool/crypto/{test => }/BCUtilTest.java | 2 +- .../hutool/crypto/{test => }/KeyUtilTest.java | 2 +- .../hutool/crypto/{test => }/PemUtilTest.java | 2 +- .../cn/hutool/crypto/{test => }/SmTest.java | 2 +- .../{test => }/asymmetric/ECIESTest.java | 5 +- .../crypto/{test => }/asymmetric/RSATest.java | 5 +- .../crypto/{test => }/asymmetric/SM2Test.java | 4 +- .../{test => }/asymmetric/SignTest.java | 4 +- .../crypto/{test => }/digest/BCryptTest.java | 3 +- .../digest/CBCBlockCipherMacEngineTest.java | 2 +- .../crypto/{test => }/digest/DigestTest.java | 13 ++- .../crypto/{test => }/digest/HmacTest.java | 4 +- .../crypto/{test => }/digest/Md5Test.java | 4 +- .../crypto/{test => }/digest/OTPTest.java | 3 +- .../crypto/{test => }/symmetric/AESTest.java | 3 +- .../{test => }/symmetric/ChaCha20Test.java | 3 +- .../crypto/{test => }/symmetric/DesTest.java | 3 +- .../{test => }/symmetric/PBKDF2Test.java | 2 +- .../crypto/{test => }/symmetric/RC4Test.java | 4 +- .../{test => }/symmetric/Sm4StreamTest.java | 3 +- .../{test => }/symmetric/SymmetricTest.java | 8 +- .../crypto/{test => }/symmetric/TEATest.java | 4 +- .../crypto/{test => }/symmetric/ZucTest.java | 3 +- .../{test => }/symmetric/fpe/FPETest.java | 3 +- 25 files changed, 137 insertions(+), 59 deletions(-) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/BCUtilTest.java (96%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/KeyUtilTest.java (98%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/PemUtilTest.java (98%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/SmTest.java (98%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/asymmetric/ECIESTest.java (86%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/asymmetric/RSATest.java (98%) mode change 100755 => 100644 rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/asymmetric/SM2Test.java (98%) mode change 100755 => 100644 rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/asymmetric/SignTest.java (97%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/digest/BCryptTest.java (75%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/digest/CBCBlockCipherMacEngineTest.java (97%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/digest/DigestTest.java (91%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/digest/HmacTest.java (95%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/digest/Md5Test.java (80%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/digest/OTPTest.java (98%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/symmetric/AESTest.java (98%) mode change 100755 => 100644 rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/symmetric/ChaCha20Test.java (90%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/symmetric/DesTest.java (92%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/symmetric/PBKDF2Test.java (88%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/symmetric/RC4Test.java (96%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/symmetric/Sm4StreamTest.java (94%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/symmetric/SymmetricTest.java (96%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/symmetric/TEATest.java (90%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/symmetric/ZucTest.java (92%) rename hutool-crypto/src/test/java/cn/hutool/crypto/{test => }/symmetric/fpe/FPETest.java (94%) diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestUtil.java b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestUtil.java index 67c1536e5..1a5f9032a 100644 --- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestUtil.java +++ b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/DigestUtil.java @@ -417,6 +417,111 @@ public class DigestUtil { return new Digester(DigestAlgorithm.SHA256).digestHex(file); } + // ------------------------------------------------------------------------------------------- SHA-512 + + /** + * 计算SHA-512摘要值 + * + * @param data 被摘要数据 + * @return SHA-512摘要 + */ + public static byte[] sha512(final byte[] data) { + return new Digester(DigestAlgorithm.SHA512).digest(data); + } + + /** + * 计算SHA-512摘要值 + * + * @param data 被摘要数据 + * @param charset 编码 + * @return SHA-512摘要 + * @since 3.0.8 + */ + public static byte[] sha512(final String data, final String charset) { + return new Digester(DigestAlgorithm.SHA512).digest(data, charset); + } + + /** + * 计算sha512摘要值，使用UTF-8编码 + * + * @param data 被摘要数据 + * @return MD5摘要 + */ + public static byte[] sha512(final String data) { + return sha512(data, CharsetUtil.NAME_UTF_8); + } + + /** + * 计算SHA-512摘要值 + * + * @param data 被摘要数据 + * @return SHA-512摘要 + */ + public static byte[] sha512(final InputStream data) { + return new Digester(DigestAlgorithm.SHA512).digest(data); + } + + /** + * 计算SHA-512摘要值 + * + * @param file 被摘要文件 + * @return SHA-512摘要 + */ + public static byte[] sha512(final File file) { + return new Digester(DigestAlgorithm.SHA512).digest(file); + } + + /** + * 计算SHA-1摘要值，并转为16进制字符串 + * + * @param data 被摘要数据 + * @return SHA-512摘要的16进制表示 + */ + public static String sha512Hex(final byte[] data) { + return new Digester(DigestAlgorithm.SHA512).digestHex(data); + } + + /** + * 计算SHA-512摘要值，并转为16进制字符串 + * + * @param data 被摘要数据 + * @param charset 编码 + * @return SHA-512摘要的16进制表示 + */ + public static String sha512Hex(final String data, final String charset) { + return new Digester(DigestAlgorithm.SHA512).digestHex(data, charset); + } + + /** + * 计算SHA-512摘要值，并转为16进制字符串 + * + * @param data 被摘要数据 + * @return SHA-512摘要的16进制表示 + */ + public static String sha512Hex(final String data) { + return sha512Hex(data, CharsetUtil.NAME_UTF_8); + } + + /** + * 计算SHA-512摘要值，并转为16进制字符串 + * + * @param data 被摘要数据 + * @return SHA-512摘要的16进制表示 + */ + public static String sha512Hex(final InputStream data) { + return new Digester(DigestAlgorithm.SHA512).digestHex(data); + } + + /** + * 计算SHA-512摘要值，并转为16进制字符串 + * + * @param file 被摘要文件 + * @return SHA-512摘要的16进制表示 + */ + public static String sha512Hex(final File file) { + return new Digester(DigestAlgorithm.SHA512).digestHex(file); + } + // ------------------------------------------------------------------------------------------- Hmac /** diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/BCUtilTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/BCUtilTest.java similarity index 96% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/BCUtilTest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/BCUtilTest.java index 3c88e2f15..d7e45ea87 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/BCUtilTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/BCUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.crypto.test; +package cn.hutool.crypto; import cn.hutool.crypto.BCUtil; import org.bouncycastle.crypto.params.ECPrivateKeyParameters; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/KeyUtilTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/KeyUtilTest.java similarity index 98% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/KeyUtilTest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/KeyUtilTest.java index c8de1b457..32807094d 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/KeyUtilTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/KeyUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.crypto.test; +package cn.hutool.crypto; import cn.hutool.crypto.CryptoException; import cn.hutool.crypto.GlobalBouncyCastleProvider; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/PemUtilTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/PemUtilTest.java similarity index 98% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/PemUtilTest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/PemUtilTest.java index 1cd5b50b0..b6ce51027 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/PemUtilTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/PemUtilTest.java @@ -1,4 +1,4 @@ -package cn.hutool.crypto.test; +package cn.hutool.crypto; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.resource.ResourceUtil; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/SmTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/SmTest.java similarity index 98% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/SmTest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/SmTest.java index 13d1f7410..cf11aca81 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/SmTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/SmTest.java @@ -1,4 +1,4 @@ -package cn.hutool.crypto.test; +package cn.hutool.crypto; import cn.hutool.core.util.CharsetUtil; import cn.hutool.crypto.KeyUtil; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/ECIESTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/ECIESTest.java similarity index 86% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/ECIESTest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/ECIESTest.java index 0844f9e67..f1c28950f 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/ECIESTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/ECIESTest.java @@ -1,9 +1,6 @@ -package cn.hutool.crypto.test.asymmetric; +package cn.hutool.crypto.asymmetric; import cn.hutool.core.text.StrUtil; -import cn.hutool.crypto.asymmetric.AsymmetricCrypto; -import cn.hutool.crypto.asymmetric.ECIES; -import cn.hutool.crypto.asymmetric.KeyType; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/RSATest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/RSATest.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/RSATest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/RSATest.java index 64905a298..f5493d808 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/RSATest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/RSATest.java @@ -1,4 +1,4 @@ -package cn.hutool.crypto.test.asymmetric; +package cn.hutool.crypto.asymmetric; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.ArrayUtil; @@ -8,9 +8,6 @@ import cn.hutool.core.util.RandomUtil; import cn.hutool.core.text.StrUtil; import cn.hutool.crypto.KeyUtil; import cn.hutool.crypto.SecureUtil; -import cn.hutool.crypto.asymmetric.AsymmetricAlgorithm; -import cn.hutool.crypto.asymmetric.KeyType; -import cn.hutool.crypto.asymmetric.RSA; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SM2Test.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SM2Test.java index 3339837f9..00e8be446 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SM2Test.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SM2Test.java @@ -1,4 +1,4 @@ -package cn.hutool.crypto.test.asymmetric; +package cn.hutool.crypto.asymmetric; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.CharsetUtil; @@ -8,8 +8,6 @@ import cn.hutool.crypto.ECKeyUtil; import cn.hutool.crypto.KeyUtil; import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.SmUtil; -import cn.hutool.crypto.asymmetric.KeyType; -import cn.hutool.crypto.asymmetric.SM2; import org.bouncycastle.crypto.engines.SM2Engine; import org.bouncycastle.crypto.params.ECPrivateKeyParameters; import org.bouncycastle.jcajce.spec.OpenSSHPrivateKeySpec; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SignTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SignTest.java similarity index 97% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SignTest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SignTest.java index 61fb6c27d..d6aebb200 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/SignTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SignTest.java @@ -1,10 +1,8 @@ -package cn.hutool.crypto.test.asymmetric; +package cn.hutool.crypto.asymmetric; import cn.hutool.core.map.MapUtil; import cn.hutool.core.text.StrUtil; import cn.hutool.crypto.SecureUtil; -import cn.hutool.crypto.asymmetric.Sign; -import cn.hutool.crypto.asymmetric.SignAlgorithm; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/BCryptTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/BCryptTest.java similarity index 75% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/BCryptTest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/digest/BCryptTest.java index 3450355ab..7ab03177b 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/BCryptTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/BCryptTest.java @@ -1,6 +1,5 @@ -package cn.hutool.crypto.test.digest; +package cn.hutool.crypto.digest; -import cn.hutool.crypto.digest.BCrypt; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/CBCBlockCipherMacEngineTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/CBCBlockCipherMacEngineTest.java similarity index 97% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/CBCBlockCipherMacEngineTest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/digest/CBCBlockCipherMacEngineTest.java index 20f0c9a68..16a98cb6c 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/CBCBlockCipherMacEngineTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/CBCBlockCipherMacEngineTest.java @@ -1,4 +1,4 @@ -package cn.hutool.crypto.test.digest; +package cn.hutool.crypto.digest; import cn.hutool.crypto.KeyUtil; import cn.hutool.crypto.digest.mac.Mac; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/DigestTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/DigestTest.java similarity index 91% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/DigestTest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/digest/DigestTest.java index f5db7416c..3fb1525da 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/DigestTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/DigestTest.java @@ -1,12 +1,10 @@ -package cn.hutool.crypto.test.digest; +package cn.hutool.crypto.digest; + import org.junit.Assert; import org.junit.Test; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.crypto.digest.DigestAlgorithm; -import cn.hutool.crypto.digest.DigestUtil; -import cn.hutool.crypto.digest.Digester; /** * 摘要算法单元测试 @@ -73,4 +71,11 @@ public class DigestTest { final String hex = DigestUtil.sha256Hex(testStr); Assert.assertEquals(64, hex.length()); } + + @Test + public void hash512Test() { + final String testStr = "Test中文"; + final String hex = DigestUtil.sha512Hex(testStr); + Assert.assertEquals(128, hex.length()); + } } diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/HmacTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/HmacTest.java similarity index 95% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/HmacTest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/digest/HmacTest.java index fef322017..3b26d461b 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/HmacTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/HmacTest.java @@ -1,11 +1,9 @@ -package cn.hutool.crypto.test.digest; +package cn.hutool.crypto.digest; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.CharsetUtil; import cn.hutool.crypto.KeyUtil; import cn.hutool.crypto.SecureUtil; -import cn.hutool.crypto.digest.HMac; -import cn.hutool.crypto.digest.HmacAlgorithm; import cn.hutool.crypto.symmetric.ZUC; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/Md5Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/Md5Test.java similarity index 80% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/Md5Test.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/digest/Md5Test.java index 828453b8c..52e2b2c8d 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/Md5Test.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/Md5Test.java @@ -1,10 +1,8 @@ -package cn.hutool.crypto.test.digest; +package cn.hutool.crypto.digest; import org.junit.Assert; import org.junit.Test; -import cn.hutool.crypto.digest.MD5; - /** * MD5 单元测试 * diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/OTPTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/OTPTest.java similarity index 98% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/OTPTest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/digest/OTPTest.java index bf0a5889d..b9b6c54be 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/digest/OTPTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/OTPTest.java @@ -1,7 +1,6 @@ -package cn.hutool.crypto.test.digest; +package cn.hutool.crypto.digest; import cn.hutool.core.codec.Base32; -import cn.hutool.crypto.digest.HmacAlgorithm; import cn.hutool.crypto.digest.otp.HOTP; import cn.hutool.crypto.digest.otp.TOTP; import org.junit.Assert; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/AESTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/AESTest.java old mode 100755 new mode 100644 similarity index 98% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/AESTest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/AESTest.java index 152ddf119..d3c313aff --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/AESTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/AESTest.java @@ -1,4 +1,4 @@ -package cn.hutool.crypto.test.symmetric; +package cn.hutool.crypto.symmetric; import cn.hutool.core.codec.Base64; import cn.hutool.core.codec.HexUtil; @@ -6,7 +6,6 @@ import cn.hutool.core.util.RandomUtil; import cn.hutool.crypto.KeyUtil; import cn.hutool.crypto.Mode; import cn.hutool.crypto.Padding; -import cn.hutool.crypto.symmetric.AES; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/ChaCha20Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ChaCha20Test.java similarity index 90% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/ChaCha20Test.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ChaCha20Test.java index 110811ec5..1dc090ae1 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/ChaCha20Test.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ChaCha20Test.java @@ -1,8 +1,7 @@ -package cn.hutool.crypto.test.symmetric; +package cn.hutool.crypto.symmetric; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.RandomUtil; -import cn.hutool.crypto.symmetric.ChaCha20; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/DesTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/DesTest.java similarity index 92% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/DesTest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/DesTest.java index 5097ed6ca..aa24fb676 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/DesTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/DesTest.java @@ -1,10 +1,9 @@ -package cn.hutool.crypto.test.symmetric; +package cn.hutool.crypto.symmetric; import cn.hutool.core.text.StrUtil; import cn.hutool.crypto.Mode; import cn.hutool.crypto.Padding; import cn.hutool.crypto.SecureUtil; -import cn.hutool.crypto.symmetric.DES; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/PBKDF2Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/PBKDF2Test.java similarity index 88% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/PBKDF2Test.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/PBKDF2Test.java index 780781ee2..7e6c2138a 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/PBKDF2Test.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/PBKDF2Test.java @@ -1,4 +1,4 @@ -package cn.hutool.crypto.test.symmetric; +package cn.hutool.crypto.symmetric; import cn.hutool.core.util.RandomUtil; import cn.hutool.crypto.SecureUtil; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/RC4Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/RC4Test.java similarity index 96% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/RC4Test.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/RC4Test.java index c6dc69e9c..1c8aa80e4 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/RC4Test.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/RC4Test.java @@ -1,11 +1,9 @@ -package cn.hutool.crypto.test.symmetric; +package cn.hutool.crypto.symmetric; import cn.hutool.core.util.CharsetUtil; import org.junit.Assert; import org.junit.Test; -import cn.hutool.crypto.symmetric.RC4; - public class RC4Test { @Test diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/Sm4StreamTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/Sm4StreamTest.java similarity index 94% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/Sm4StreamTest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/Sm4StreamTest.java index f8f395ef0..8d03f2752 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/Sm4StreamTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/Sm4StreamTest.java @@ -1,6 +1,5 @@ -package cn.hutool.crypto.test.symmetric; +package cn.hutool.crypto.symmetric; -import cn.hutool.crypto.symmetric.SM4; import org.junit.Ignore; import org.junit.Test; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/SymmetricTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/SymmetricTest.java similarity index 96% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/SymmetricTest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/SymmetricTest.java index 62369dfbe..7534ddf0e 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/SymmetricTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/SymmetricTest.java @@ -1,4 +1,4 @@ -package cn.hutool.crypto.test.symmetric; +package cn.hutool.crypto.symmetric; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.CharsetUtil; @@ -9,12 +9,6 @@ import cn.hutool.crypto.KeyUtil; import cn.hutool.crypto.Mode; import cn.hutool.crypto.Padding; import cn.hutool.crypto.SecureUtil; -import cn.hutool.crypto.symmetric.AES; -import cn.hutool.crypto.symmetric.DES; -import cn.hutool.crypto.symmetric.DESede; -import cn.hutool.crypto.symmetric.SymmetricAlgorithm; -import cn.hutool.crypto.symmetric.SymmetricCrypto; -import cn.hutool.crypto.symmetric.Vigenere; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/TEATest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/TEATest.java similarity index 90% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/TEATest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/TEATest.java index 75b223dd6..05ef3c864 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/TEATest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/TEATest.java @@ -1,7 +1,5 @@ -package cn.hutool.crypto.test.symmetric; +package cn.hutool.crypto.symmetric; -import cn.hutool.crypto.symmetric.SymmetricCrypto; -import cn.hutool.crypto.symmetric.XXTEA; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/ZucTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ZucTest.java similarity index 92% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/ZucTest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ZucTest.java index d4b4b49d6..e9288b4c6 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/ZucTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ZucTest.java @@ -1,8 +1,7 @@ -package cn.hutool.crypto.test.symmetric; +package cn.hutool.crypto.symmetric; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.RandomUtil; -import cn.hutool.crypto.symmetric.ZUC; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/fpe/FPETest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/fpe/FPETest.java similarity index 94% rename from hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/fpe/FPETest.java rename to hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/fpe/FPETest.java index ff4c80dab..6bfbb71c0 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/symmetric/fpe/FPETest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/fpe/FPETest.java @@ -1,7 +1,6 @@ -package cn.hutool.crypto.test.symmetric.fpe; +package cn.hutool.crypto.symmetric.fpe; import cn.hutool.core.util.RandomUtil; -import cn.hutool.crypto.symmetric.fpe.FPE; import org.bouncycastle.crypto.util.BasicAlphabetMapper; import org.junit.Assert; import org.junit.Test;