From 0f0af0742edfcb87cab6ec9b89dc849a9c6fa0e8 Mon Sep 17 00:00:00 2001
From: Adam Velebil <adam.velebil@yubico.com>
Date: Tue, 28 Jan 2025 09:30:43 +0100
Subject: [PATCH] fix JCA provider setup for device tests

---
 .../java/com/yubico/yubikit/testing/TestState.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 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
index 1aef8218..03233716 100644
--- 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() {