fix JCA provider setup for device tests

Yubico · Jan 28, 2025 · 0f0af07 · 0f0af07
1 parent 07cc00d
commit 0f0af07
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/testing/src/main/java/com/yubico/yubikit/testing/TestState.java b/testing/src/main/java/com/yubico/yubikit/testing/TestState.java
@@ -72,16 +72,15 @@ protected TestState(Builder<?> builder) {
     this.currentDevice = builder.device;
     this.usbPid = builder.usbPid;
     this.scpKid = builder.scpKid;
+
+    if (this.scpKid != null) {
+      Security.removeProvider("BC");
+      Security.insertProviderAt(new BouncyCastleProvider(), 1);
+    }
+
     this.scpParameters = new ScpParameters(builder.device, this.scpKid);
     this.reconnectDeviceCallback = builder.reconnectDeviceCallback;
     this.isUsbTransport = builder.device.getTransport() == Transport.USB;
-
-    setupJca();
-  }
-
-  private void setupJca() {
-    Security.removeProvider("BC");
-    Security.insertProviderAt(new BouncyCastleProvider(), 1);
   }
 
   public boolean isUsbTransport() {