+ * 不调用 {@code Security.addProvider}:所有 JCA 查找都显式传入 provider 实例, + * 既避免污染宿主的全局 Provider 表,也保证被版本守卫拒绝的实例不会残留可被 + * 其他组件选中。 + *
+ * 版本校验放在 {@link #provider()} 取用时而非静态初始化块:静态初始化抛出的 + * 运行时异常会被 JVM 包装为 {@link ExceptionInInitializerError},调用方按 + * {@code WopError} catch 不到;取用时校验可让配置错误以原始类型直达调用方。 + *
+ * jdk15on 发行线:最低版本 1.65,见 {@link BouncyCastleVersionGuard}。 */ public final class BouncyCastleHolder { @@ -18,15 +25,17 @@ public final class BouncyCastleHolder { private BouncyCastleHolder() { } - /** 已注册的 BC Provider(类加载即完成注册,进程级单例)。 */ + /** + * BC Provider 单例(未注册到全局 Provider 表)。 + * + * @throws com.wanlianyida.wop.WopError BC 版本低于 {@link BouncyCastleVersionGuard#MIN_VERSION} + */ public static Provider provider() { - return PROVIDER; + return BouncyCastleVersionGuard.requireSupported(PROVIDER); } - /** 自建实例注册(同名已注册返回 -1 无害,始终使用自建实例)。 */ + /** 创建自建实例(仅持有,不注册全局)。 */ private static Provider register() { - Provider provider = new BouncyCastleProvider(); - Security.addProvider(provider); - return provider; + return new BouncyCastleProvider(); } } diff --git a/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/BouncyCastleVersionGuard.java b/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/BouncyCastleVersionGuard.java new file mode 100644 index 0000000..89d3053 --- /dev/null +++ b/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/BouncyCastleVersionGuard.java @@ -0,0 +1,39 @@ +package com.wanlianyida.wop.crypto; + +import com.wanlianyida.wop.WopError; + +import java.security.Provider; + +/** + * jdk15on 发行线的 BouncyCastle 版本下限守卫(1.65)。 + *
+ * 消费者可能在自己的 pom 中声明更低的 bcprov-jdk15on,并因 Maven 就近优先胜出; + * 此处 fail-fast 转为明确的配置错误,避免下游抛 {@code NoSuchMethodError}。 + *
+ * 独立成包内类而非挂在 {@link BouncyCastleHolder} 上:后者是公共 API 门禁覆盖的类, + * 任何成员增减都会被 japicmp 记为 break。 + */ +final class BouncyCastleVersionGuard { + + /** 最低 BC 版本(1.65 起纳入测试矩阵)。 */ + static final double MIN_VERSION = 1.65; + + /** 工具类禁实例化。 */ + private BouncyCastleVersionGuard() { + } + + /** 版本守卫:低于 {@link #MIN_VERSION} 明确拒绝。 */ + static Provider requireSupported(Provider provider) { + requireSupportedVersion(provider.getVersion()); + return provider; + } + + /** 版本判定(拆出便于单测覆盖两侧分支)。 */ + static void requireSupportedVersion(double version) { + if (version < MIN_VERSION) { + throw WopError.configuration("BouncyCastle 版本过低(当前 " + version + + ",要求 >= " + MIN_VERSION + "):请将 bcprov-jdk15on 升级到 1.65 及以上," + + "或改用 jdk18on 发行线"); + } + } +} diff --git a/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm2KeyEncryptStrategy.java b/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm2KeyEncryptStrategy.java index 25c92a1..775fc7a 100644 --- a/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm2KeyEncryptStrategy.java +++ b/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm2KeyEncryptStrategy.java @@ -1,5 +1,6 @@ package com.wanlianyida.wop.crypto.strategies; +import com.wanlianyida.wop.crypto.BouncyCastleHolder; import com.wanlianyida.wop.crypto.CryptoException; import org.bouncycastle.crypto.engines.SM2Engine; import org.bouncycastle.crypto.params.ECPrivateKeyParameters; @@ -34,9 +35,10 @@ public byte[] encrypt(byte[] plainKey, PublicKey publicKey) { return encrypt(plainKey, publicKey, RANDOM); } - /** 加密随机 k 取自注入源(确定性钩子)。 */ + /** 加密随机 k 取自注入源(确定性钩子);版本守卫在 try 之外。 */ @Override public byte[] encrypt(byte[] plainKey, PublicKey publicKey, SecureRandom random) { + BouncyCastleHolder.provider(); try { ECPublicKeyParameters params = Sm2Support.toPublicParams(publicKey); SM2Engine engine = new SM2Engine(SM2Engine.Mode.C1C3C2); @@ -47,9 +49,10 @@ public byte[] encrypt(byte[] plainKey, PublicKey publicKey, SecureRandom random) } } - /** 解包(C1C3C2 顺序;旧国标 C1C2C3 密文必然失败)。 */ + /** 解包(C1C3C2 顺序;旧国标 C1C2C3 密文必然失败);版本守卫在 try 之外。 */ @Override public byte[] decrypt(byte[] cipherText, PrivateKey privateKey) { + BouncyCastleHolder.provider(); try { ECPrivateKeyParameters params = Sm2Support.toPrivateParams(privateKey); SM2Engine engine = new SM2Engine(SM2Engine.Mode.C1C3C2); diff --git a/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm2SignatureStrategy.java b/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm2SignatureStrategy.java index 5882574..40bf9df 100644 --- a/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm2SignatureStrategy.java +++ b/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm2SignatureStrategy.java @@ -1,5 +1,6 @@ package com.wanlianyida.wop.crypto.strategies; +import com.wanlianyida.wop.crypto.BouncyCastleHolder; import com.wanlianyida.wop.crypto.CryptoException; import org.bouncycastle.asn1.ASN1EncodableVector; import org.bouncycastle.asn1.ASN1Integer; @@ -39,9 +40,10 @@ public final class Sm2SignatureStrategy implements SignatureStrategy { private Sm2SignatureStrategy() { } - /** 加签(BC 产出 DER 后转裸 r‖s 64B,D9;userId 贯通 D14)。 */ + /** 加签(BC 产出 DER 后转裸 r‖s 64B,D9;userId 贯通 D14);版本守卫在 try 之外。 */ @Override public byte[] sign(byte[] data, PrivateKey privateKey, byte[] userId) { + BouncyCastleHolder.provider(); try { ECPrivateKeyParameters params = Sm2Support.toPrivateParams(privateKey); SM2Signer signer = new SM2Signer(); @@ -59,6 +61,7 @@ public boolean verify(byte[] data, byte[] signature, PublicKey publicKey, byte[] if (signature == null || signature.length != RS_BYTES * 2) { return false; } + BouncyCastleHolder.provider(); try { ECPublicKeyParameters params = Sm2Support.toPublicParams(publicKey); SM2Signer verifier = new SM2Signer(); diff --git a/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm2Support.java b/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm2Support.java index 60f1c6e..028b42f 100644 --- a/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm2Support.java +++ b/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm2Support.java @@ -1,5 +1,7 @@ package com.wanlianyida.wop.crypto.strategies; +import com.wanlianyida.wop.crypto.BouncyCastleHolder; + import org.bouncycastle.crypto.params.ECDomainParameters; import org.bouncycastle.crypto.params.ECPrivateKeyParameters; import org.bouncycastle.crypto.params.ECPublicKeyParameters; @@ -26,8 +28,9 @@ public final class Sm2Support { private Sm2Support() { } - /** JCA BCEC 公钥 → BC 轻量参数(曲线守卫)。 */ + /** JCA BCEC 公钥 → BC 轻量参数(曲线守卫);SM2 轻量 API 不经过 JCA,此处承担版本守卫。 */ public static ECPublicKeyParameters toPublicParams(PublicKey publicKey) { + BouncyCastleHolder.provider(); if (!(publicKey instanceof ECPublicKey)) { throw new IllegalArgumentException("公钥非 SM2 椭圆曲线密钥"); } @@ -40,8 +43,9 @@ public static org.bouncycastle.crypto.params.ECNamedDomainParameters namedDomain return Sm2DomainHolder.NAMED; } - /** JCA BCEC 私钥 → BC 轻量参数(曲线守卫)。 */ + /** JCA BCEC 私钥 → BC 轻量参数(曲线守卫);SM2 轻量 API 不经过 JCA,此处承担版本守卫。 */ public static ECPrivateKeyParameters toPrivateParams(PrivateKey privateKey) { + BouncyCastleHolder.provider(); if (!(privateKey instanceof ECPrivateKey)) { throw new IllegalArgumentException("私钥非 SM2 椭圆曲线密钥"); } diff --git a/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm3DigestStrategy.java b/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm3DigestStrategy.java index bdf0953..8250529 100644 --- a/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm3DigestStrategy.java +++ b/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm3DigestStrategy.java @@ -4,6 +4,7 @@ import com.wanlianyida.wop.crypto.CryptoException; import java.security.MessageDigest; +import java.security.Provider; /** * 国密摘要策略:SM3(BC 承接)。 @@ -18,11 +19,12 @@ public final class Sm3DigestStrategy implements DigestStrategy { private Sm3DigestStrategy() { } - /** 计算 SM3 摘要(BC 承接)。 */ + /** 计算 SM3 摘要(BC 承接);版本守卫在 try 之外,保证配置错误不被包装为加密失败。 */ @Override public byte[] digest(byte[] data) { + Provider provider = BouncyCastleHolder.provider(); try { - return MessageDigest.getInstance(ALGORITHM, BouncyCastleHolder.provider()).digest(data); + return MessageDigest.getInstance(ALGORITHM, provider).digest(data); } catch (Exception e) { throw new CryptoException("DIGEST", ALGORITHM, "SM3 摘要失败", e); } diff --git a/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm4GcmStrategy.java b/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm4GcmStrategy.java index d9aa398..2029b59 100644 --- a/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm4GcmStrategy.java +++ b/wop-sdk-core/src/main/java/com/wanlianyida/wop/crypto/strategies/Sm4GcmStrategy.java @@ -3,6 +3,7 @@ import com.wanlianyida.wop.crypto.BouncyCastleHolder; import com.wanlianyida.wop.crypto.CryptoException; +import java.security.Provider; import java.security.SecureRandom; import javax.crypto.Cipher; @@ -48,8 +49,9 @@ public CipherResult encrypt(byte[] plain, byte[] key, SecureRandom random) { CipherResult encryptForVector(byte[] plain, byte[] key, byte[] iv) { requireKey(key); requireIv(iv); + Provider provider = BouncyCastleHolder.provider(); try { - Cipher cipher = Cipher.getInstance(TRANSFORMATION, BouncyCastleHolder.provider()); + Cipher cipher = Cipher.getInstance(TRANSFORMATION, provider); cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(key, "SM4"), new GCMParameterSpec(TAG_BITS, iv)); return new CipherResult(cipher.doFinal(plain), iv); } catch (Exception e) { @@ -62,8 +64,9 @@ CipherResult encryptForVector(byte[] plain, byte[] key, byte[] iv) { public byte[] decrypt(byte[] cipher, byte[] iv, byte[] key) { requireKey(key); requireIv(iv); + Provider provider = BouncyCastleHolder.provider(); try { - Cipher decryptor = Cipher.getInstance(TRANSFORMATION, BouncyCastleHolder.provider()); + Cipher decryptor = Cipher.getInstance(TRANSFORMATION, provider); decryptor.init(Cipher.DECRYPT_MODE, new SecretKeySpec(key, "SM4"), new GCMParameterSpec(TAG_BITS, iv)); return decryptor.doFinal(cipher); } catch (Exception e) { diff --git a/wop-sdk-core/src/test/java/com/wanlianyida/wop/crypto/BouncyCastleVersionGuardTest.java b/wop-sdk-core/src/test/java/com/wanlianyida/wop/crypto/BouncyCastleVersionGuardTest.java new file mode 100644 index 0000000..768be63 --- /dev/null +++ b/wop-sdk-core/src/test/java/com/wanlianyida/wop/crypto/BouncyCastleVersionGuardTest.java @@ -0,0 +1,68 @@ +package com.wanlianyida.wop.crypto; + +import com.wanlianyida.wop.WopError; +import org.junit.jupiter.api.Test; + +import java.security.Provider; + +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * jdk15on 发行线:BC 版本下限守卫(1.65)。 + *
+ * 消费者可能在自己的 pom 中声明更低的 bcprov-jdk15on 并因 Maven 就近优先胜出,
+ * 此处必须 fail-fast 为明确的配置错误,而不是让下游抛 {@code NoSuchMethodError}。
+ */
+class BouncyCastleVersionGuardTest {
+
+ @Test
+ void rejectVersionBelowFloor() {
+ WopError error = assertThrows(WopError.class,
+ () -> BouncyCastleVersionGuard.requireSupportedVersion(1.5));
+ assertEquals(WopError.Category.configuration, error.category());
+ assertTrue(error.getMessage().contains("1.65"));
+ }
+
+ @Test
+ void acceptFloorVersion() {
+ assertDoesNotThrow(() -> BouncyCastleVersionGuard.requireSupportedVersion(1.65));
+ }
+
+ @Test
+ void acceptNewerVersion() {
+ assertDoesNotThrow(() -> BouncyCastleVersionGuard.requireSupportedVersion(1.70));
+ }
+
+ @Test
+ void rejectProviderBelowFloor() {
+ Provider old = new FakeProvider(1.5);
+ WopError error = assertThrows(WopError.class,
+ () -> BouncyCastleVersionGuard.requireSupported(old));
+ assertEquals(WopError.Category.configuration, error.category());
+ }
+
+ @Test
+ void acceptProviderAtFloor() {
+ Provider provider = new FakeProvider(1.65);
+ assertSame(provider, BouncyCastleVersionGuard.requireSupported(provider));
+ }
+
+ @Test
+ void holderReturnsSingletonAboveFloor() {
+ Provider provider = BouncyCastleHolder.provider();
+ assertSame(provider, BouncyCastleHolder.provider());
+ assertTrue(provider.getVersion() >= BouncyCastleVersionGuard.MIN_VERSION);
+ }
+
+ /** 测试用 Provider(protected 构造函数经子类访问)。 */
+ private static final class FakeProvider extends Provider {
+
+ private FakeProvider(double version) {
+ super("WOP-TEST", version, "test provider");
+ }
+ }
+}
diff --git a/wop-sdk-jdkhttp/pom.xml b/wop-sdk-jdkhttp/pom.xml
index d331b16..7e2d1b7 100644
--- a/wop-sdk-jdkhttp/pom.xml
+++ b/wop-sdk-jdkhttp/pom.xml
@@ -7,7 +7,7 @@