diff --git a/samples/sample-all-deactivated/build.gradle.kts b/samples/sample-all-deactivated/build.gradle.kts
index 81544f2..99f0d2d 100644
--- a/samples/sample-all-deactivated/build.gradle.kts
+++ b/samples/sample-all-deactivated/build.gradle.kts
@@ -139,41 +139,41 @@ dependencies {
     implementation("org.apache.tomcat:tomcat-websocket-client-api:11.0.10")
     implementation("org.apache.velocity:velocity-engine-core:2.4.1")
     implementation("org.apache.velocity:velocity:1.7")
-    implementation("org.bouncycastle:bc-fips-debug:2.1.1")
-    implementation("org.bouncycastle:bc-fips:2.1.1")
+    implementation("org.bouncycastle:bc-fips-debug:2.1.2")
+    implementation("org.bouncycastle:bc-fips:2.1.2")
     implementation("org.bouncycastle:bcjmail-jdk15on:1.70")
-    implementation("org.bouncycastle:bcjmail-jdk15to18:1.81")
-    implementation("org.bouncycastle:bcjmail-jdk18on:1.81")
-    implementation("org.bouncycastle:bcjmail-lts8on:2.73.8")
+    implementation("org.bouncycastle:bcjmail-jdk15to18:1.82")
+    implementation("org.bouncycastle:bcjmail-jdk18on:1.82")
+    implementation("org.bouncycastle:bcjmail-lts8on:2.73.9")
     implementation("org.bouncycastle:bcmail-fips:2.1.6")
-    implementation("org.bouncycastle:bcmail-jdk14:1.81")
+    implementation("org.bouncycastle:bcmail-jdk14:1.82")
     implementation("org.bouncycastle:bcmail-jdk15+:1.46")
     implementation("org.bouncycastle:bcmail-jdk15:1.46")
     implementation("org.bouncycastle:bcmail-jdk15on:1.70")
-    implementation("org.bouncycastle:bcmail-jdk15to18:1.81")
+    implementation("org.bouncycastle:bcmail-jdk15to18:1.82")
     implementation("org.bouncycastle:bcmail-jdk16:1.46")
-    implementation("org.bouncycastle:bcmail-jdk18on:1.81")
-    implementation("org.bouncycastle:bcmail-lts8on:2.73.8")
+    implementation("org.bouncycastle:bcmail-jdk18on:1.82")
+    implementation("org.bouncycastle:bcmail-lts8on:2.73.9")
     implementation("org.bouncycastle:bcpg-fips:2.1.11")
     implementation("org.bouncycastle:bcpg-jdk12:130")
-    implementation("org.bouncycastle:bcpg-jdk14:1.81")
+    implementation("org.bouncycastle:bcpg-jdk14:1.82")
     implementation("org.bouncycastle:bcpg-jdk15+:1.46")
     implementation("org.bouncycastle:bcpg-jdk15:1.46")
     implementation("org.bouncycastle:bcpg-jdk15on:1.70")
-    implementation("org.bouncycastle:bcpg-jdk15to18:1.81")
+    implementation("org.bouncycastle:bcpg-jdk15to18:1.82")
     implementation("org.bouncycastle:bcpg-jdk16:1.46")
-    implementation("org.bouncycastle:bcpg-jdk18on:1.81")
-    implementation("org.bouncycastle:bcpg-lts8on:2.73.8")
-    implementation("org.bouncycastle:bcpkix-fips:2.1.9")
-    implementation("org.bouncycastle:bcpkix-jdk14:1.81")
+    implementation("org.bouncycastle:bcpg-jdk18on:1.82")
+    implementation("org.bouncycastle:bcpg-lts8on:2.73.9")
+    implementation("org.bouncycastle:bcpkix-fips:2.1.10")
+    implementation("org.bouncycastle:bcpkix-jdk14:1.82")
     implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
-    implementation("org.bouncycastle:bcpkix-jdk15to18:1.81")
-    implementation("org.bouncycastle:bcpkix-jdk18on:1.81")
-    implementation("org.bouncycastle:bcpkix-lts8on:2.73.8")
-    implementation("org.bouncycastle:bcprov-debug-jdk14:1.81")
+    implementation("org.bouncycastle:bcpkix-jdk15to18:1.82")
+    implementation("org.bouncycastle:bcpkix-jdk18on:1.82")
+    implementation("org.bouncycastle:bcpkix-lts8on:2.73.9")
+    implementation("org.bouncycastle:bcprov-debug-jdk14:1.82")
     implementation("org.bouncycastle:bcprov-debug-jdk15on:1.70")
-    implementation("org.bouncycastle:bcprov-debug-jdk15to18:1.81")
-    implementation("org.bouncycastle:bcprov-debug-jdk18on:1.81")
+    implementation("org.bouncycastle:bcprov-debug-jdk15to18:1.82")
+    implementation("org.bouncycastle:bcprov-debug-jdk18on:1.82")
     implementation("org.bouncycastle:bcprov-ext-debug-jdk14:1.74")
     implementation("org.bouncycastle:bcprov-ext-debug-jdk15on:1.70")
     implementation("org.bouncycastle:bcprov-ext-debug-jdk15to18:1.77")
@@ -185,30 +185,30 @@ dependencies {
     implementation("org.bouncycastle:bcprov-ext-jdk16:1.46")
     implementation("org.bouncycastle:bcprov-ext-jdk18on:1.78.1")
     implementation("org.bouncycastle:bcprov-jdk12:130")
-    implementation("org.bouncycastle:bcprov-jdk14:1.81")
+    implementation("org.bouncycastle:bcprov-jdk14:1.82")
     implementation("org.bouncycastle:bcprov-jdk15+:1.46")
     implementation("org.bouncycastle:bcprov-jdk15:1.46")
     implementation("org.bouncycastle:bcprov-jdk15on:1.70")
-    implementation("org.bouncycastle:bcprov-jdk15to18:1.81")
+    implementation("org.bouncycastle:bcprov-jdk15to18:1.82")
     implementation("org.bouncycastle:bcprov-jdk16:1.46")
-    implementation("org.bouncycastle:bcprov-jdk18on:1.81")
-    implementation("org.bouncycastle:bcprov-lts8on:2.73.8")
-    implementation("org.bouncycastle:bctls-fips:2.1.20")
-    implementation("org.bouncycastle:bctls-jdk14:1.81")
+    implementation("org.bouncycastle:bcprov-jdk18on:1.82")
+    implementation("org.bouncycastle:bcprov-lts8on:2.73.9")
+    implementation("org.bouncycastle:bctls-fips:2.1.22")
+    implementation("org.bouncycastle:bctls-jdk14:1.82")
     implementation("org.bouncycastle:bctls-jdk15on:1.70")
-    implementation("org.bouncycastle:bctls-jdk15to18:1.81")
-    implementation("org.bouncycastle:bctls-jdk18on:1.81")
-    implementation("org.bouncycastle:bctls-lts8on:2.73.8")
+    implementation("org.bouncycastle:bctls-jdk15to18:1.82")
+    implementation("org.bouncycastle:bctls-jdk18on:1.82")
+    implementation("org.bouncycastle:bctls-lts8on:2.73.9")
     implementation("org.bouncycastle:bctsp-jdk14:1.46")
     implementation("org.bouncycastle:bctsp-jdk15+:1.46")
     implementation("org.bouncycastle:bctsp-jdk15:1.46")
     implementation("org.bouncycastle:bctsp-jdk15on:1.46")
     implementation("org.bouncycastle:bctsp-jdk16:1.46")
-    implementation("org.bouncycastle:bcutil-jdk14:1.81")
+    implementation("org.bouncycastle:bcutil-jdk14:1.82")
     implementation("org.bouncycastle:bcutil-jdk15on:1.70")
-    implementation("org.bouncycastle:bcutil-jdk15to18:1.81")
-    implementation("org.bouncycastle:bcutil-jdk18on:1.81")
-    implementation("org.bouncycastle:bcutil-lts8on:2.73.8")
+    implementation("org.bouncycastle:bcutil-jdk15to18:1.82")
+    implementation("org.bouncycastle:bcutil-jdk18on:1.82")
+    implementation("org.bouncycastle:bcutil-lts8on:2.73.9")
     implementation("org.codehaus.woodstox:woodstox-core-asl:4.4.1")
     implementation("org.codehaus.woodstox:woodstox-core-lgpl:4.4.1")
     implementation("org.codehaus.woodstox:wstx-asl:4.0.6")
diff --git a/samples/sample-all-deactivated/build.out b/samples/sample-all-deactivated/build.out
index c51e63f..89f2aee 100644
--- a/samples/sample-all-deactivated/build.out
+++ b/samples/sample-all-deactivated/build.out
@@ -147,41 +147,41 @@ compileClasspath - Compile classpath for source set 'main'.
 +--- org.apache.tomcat:tomcat-websocket-client-api:11.0.10 FAILED
 +--- org.apache.velocity:velocity-engine-core:2.4.1 FAILED
 +--- org.apache.velocity:velocity:1.7 FAILED
-+--- org.bouncycastle:bc-fips-debug:2.1.1 FAILED
-+--- org.bouncycastle:bc-fips:2.1.1 FAILED
++--- org.bouncycastle:bc-fips-debug:2.1.2 FAILED
++--- org.bouncycastle:bc-fips:2.1.2 FAILED
 +--- org.bouncycastle:bcjmail-jdk15on:1.70 FAILED
-+--- org.bouncycastle:bcjmail-jdk15to18:1.81 FAILED
-+--- org.bouncycastle:bcjmail-jdk18on:1.81 FAILED
-+--- org.bouncycastle:bcjmail-lts8on:2.73.8 FAILED
++--- org.bouncycastle:bcjmail-jdk15to18:1.82 FAILED
++--- org.bouncycastle:bcjmail-jdk18on:1.82 FAILED
++--- org.bouncycastle:bcjmail-lts8on:2.73.9 FAILED
 +--- org.bouncycastle:bcmail-fips:2.1.6 FAILED
-+--- org.bouncycastle:bcmail-jdk14:1.81 FAILED
++--- org.bouncycastle:bcmail-jdk14:1.82 FAILED
 +--- org.bouncycastle:bcmail-jdk15+:1.46 FAILED
 +--- org.bouncycastle:bcmail-jdk15:1.46 FAILED
 +--- org.bouncycastle:bcmail-jdk15on:1.70 FAILED
-+--- org.bouncycastle:bcmail-jdk15to18:1.81 FAILED
++--- org.bouncycastle:bcmail-jdk15to18:1.82 FAILED
 +--- org.bouncycastle:bcmail-jdk16:1.46 FAILED
-+--- org.bouncycastle:bcmail-jdk18on:1.81 FAILED
-+--- org.bouncycastle:bcmail-lts8on:2.73.8 FAILED
++--- org.bouncycastle:bcmail-jdk18on:1.82 FAILED
++--- org.bouncycastle:bcmail-lts8on:2.73.9 FAILED
 +--- org.bouncycastle:bcpg-fips:2.1.11 FAILED
 +--- org.bouncycastle:bcpg-jdk12:130 FAILED
-+--- org.bouncycastle:bcpg-jdk14:1.81 FAILED
++--- org.bouncycastle:bcpg-jdk14:1.82 FAILED
 +--- org.bouncycastle:bcpg-jdk15+:1.46 FAILED
 +--- org.bouncycastle:bcpg-jdk15:1.46 FAILED
 +--- org.bouncycastle:bcpg-jdk15on:1.70 FAILED
-+--- org.bouncycastle:bcpg-jdk15to18:1.81 FAILED
++--- org.bouncycastle:bcpg-jdk15to18:1.82 FAILED
 +--- org.bouncycastle:bcpg-jdk16:1.46 FAILED
-+--- org.bouncycastle:bcpg-jdk18on:1.81 FAILED
-+--- org.bouncycastle:bcpg-lts8on:2.73.8 FAILED
-+--- org.bouncycastle:bcpkix-fips:2.1.9 FAILED
-+--- org.bouncycastle:bcpkix-jdk14:1.81 FAILED
++--- org.bouncycastle:bcpg-jdk18on:1.82 FAILED
++--- org.bouncycastle:bcpg-lts8on:2.73.9 FAILED
++--- org.bouncycastle:bcpkix-fips:2.1.10 FAILED
++--- org.bouncycastle:bcpkix-jdk14:1.82 FAILED
 +--- org.bouncycastle:bcpkix-jdk15on:1.70 FAILED
-+--- org.bouncycastle:bcpkix-jdk15to18:1.81 FAILED
-+--- org.bouncycastle:bcpkix-jdk18on:1.81 FAILED
-+--- org.bouncycastle:bcpkix-lts8on:2.73.8 FAILED
-+--- org.bouncycastle:bcprov-debug-jdk14:1.81 FAILED
++--- org.bouncycastle:bcpkix-jdk15to18:1.82 FAILED
++--- org.bouncycastle:bcpkix-jdk18on:1.82 FAILED
++--- org.bouncycastle:bcpkix-lts8on:2.73.9 FAILED
++--- org.bouncycastle:bcprov-debug-jdk14:1.82 FAILED
 +--- org.bouncycastle:bcprov-debug-jdk15on:1.70 FAILED
-+--- org.bouncycastle:bcprov-debug-jdk15to18:1.81 FAILED
-+--- org.bouncycastle:bcprov-debug-jdk18on:1.81 FAILED
++--- org.bouncycastle:bcprov-debug-jdk15to18:1.82 FAILED
++--- org.bouncycastle:bcprov-debug-jdk18on:1.82 FAILED
 +--- org.bouncycastle:bcprov-ext-debug-jdk14:1.74 FAILED
 +--- org.bouncycastle:bcprov-ext-debug-jdk15on:1.70 FAILED
 +--- org.bouncycastle:bcprov-ext-debug-jdk15to18:1.77 FAILED
@@ -193,30 +193,30 @@ compileClasspath - Compile classpath for source set 'main'.
 +--- org.bouncycastle:bcprov-ext-jdk16:1.46 FAILED
 +--- org.bouncycastle:bcprov-ext-jdk18on:1.78.1 FAILED
 +--- org.bouncycastle:bcprov-jdk12:130 FAILED
-+--- org.bouncycastle:bcprov-jdk14:1.81 FAILED
++--- org.bouncycastle:bcprov-jdk14:1.82 FAILED
 +--- org.bouncycastle:bcprov-jdk15+:1.46 FAILED
 +--- org.bouncycastle:bcprov-jdk15:1.46 FAILED
 +--- org.bouncycastle:bcprov-jdk15on:1.70 FAILED
-+--- org.bouncycastle:bcprov-jdk15to18:1.81 FAILED
++--- org.bouncycastle:bcprov-jdk15to18:1.82 FAILED
 +--- org.bouncycastle:bcprov-jdk16:1.46 FAILED
-+--- org.bouncycastle:bcprov-jdk18on:1.81 FAILED
-+--- org.bouncycastle:bcprov-lts8on:2.73.8 FAILED
-+--- org.bouncycastle:bctls-fips:2.1.20 FAILED
-+--- org.bouncycastle:bctls-jdk14:1.81 FAILED
++--- org.bouncycastle:bcprov-jdk18on:1.82 FAILED
++--- org.bouncycastle:bcprov-lts8on:2.73.9 FAILED
++--- org.bouncycastle:bctls-fips:2.1.22 FAILED
++--- org.bouncycastle:bctls-jdk14:1.82 FAILED
 +--- org.bouncycastle:bctls-jdk15on:1.70 FAILED
-+--- org.bouncycastle:bctls-jdk15to18:1.81 FAILED
-+--- org.bouncycastle:bctls-jdk18on:1.81 FAILED
-+--- org.bouncycastle:bctls-lts8on:2.73.8 FAILED
++--- org.bouncycastle:bctls-jdk15to18:1.82 FAILED
++--- org.bouncycastle:bctls-jdk18on:1.82 FAILED
++--- org.bouncycastle:bctls-lts8on:2.73.9 FAILED
 +--- org.bouncycastle:bctsp-jdk14:1.46 FAILED
 +--- org.bouncycastle:bctsp-jdk15+:1.46 FAILED
 +--- org.bouncycastle:bctsp-jdk15:1.46 FAILED
 +--- org.bouncycastle:bctsp-jdk15on:1.46 FAILED
 +--- org.bouncycastle:bctsp-jdk16:1.46 FAILED
-+--- org.bouncycastle:bcutil-jdk14:1.81 FAILED
++--- org.bouncycastle:bcutil-jdk14:1.82 FAILED
 +--- org.bouncycastle:bcutil-jdk15on:1.70 FAILED
-+--- org.bouncycastle:bcutil-jdk15to18:1.81 FAILED
-+--- org.bouncycastle:bcutil-jdk18on:1.81 FAILED
-+--- org.bouncycastle:bcutil-lts8on:2.73.8 FAILED
++--- org.bouncycastle:bcutil-jdk15to18:1.82 FAILED
++--- org.bouncycastle:bcutil-jdk18on:1.82 FAILED
++--- org.bouncycastle:bcutil-lts8on:2.73.9 FAILED
 +--- org.codehaus.woodstox:woodstox-core-asl:4.4.1 FAILED
 +--- org.codehaus.woodstox:woodstox-core-lgpl:4.4.1 FAILED
 +--- org.codehaus.woodstox:wstx-asl:4.0.6 FAILED
diff --git a/samples/sample-all/build.gradle.kts b/samples/sample-all/build.gradle.kts
index ef0ad53..6dec155 100644
--- a/samples/sample-all/build.gradle.kts
+++ b/samples/sample-all/build.gradle.kts
@@ -142,41 +142,41 @@ dependencies {
     implementation("org.apache.tomcat:tomcat-websocket-client-api:11.0.10")
     implementation("org.apache.velocity:velocity-engine-core:2.4.1")
     implementation("org.apache.velocity:velocity:1.7")
-    implementation("org.bouncycastle:bc-fips-debug:2.1.1")
-    implementation("org.bouncycastle:bc-fips:2.1.1")
+    implementation("org.bouncycastle:bc-fips-debug:2.1.2")
+    implementation("org.bouncycastle:bc-fips:2.1.2")
     implementation("org.bouncycastle:bcjmail-jdk15on:1.70")
-    implementation("org.bouncycastle:bcjmail-jdk15to18:1.81")
-    implementation("org.bouncycastle:bcjmail-jdk18on:1.81")
-    implementation("org.bouncycastle:bcjmail-lts8on:2.73.8")
+    implementation("org.bouncycastle:bcjmail-jdk15to18:1.82")
+    implementation("org.bouncycastle:bcjmail-jdk18on:1.82")
+    implementation("org.bouncycastle:bcjmail-lts8on:2.73.9")
     implementation("org.bouncycastle:bcmail-fips:2.1.6")
-    implementation("org.bouncycastle:bcmail-jdk14:1.81")
+    implementation("org.bouncycastle:bcmail-jdk14:1.82")
     implementation("org.bouncycastle:bcmail-jdk15+:1.46")
     implementation("org.bouncycastle:bcmail-jdk15:1.46")
     implementation("org.bouncycastle:bcmail-jdk15on:1.70")
-    implementation("org.bouncycastle:bcmail-jdk15to18:1.81")
+    implementation("org.bouncycastle:bcmail-jdk15to18:1.82")
     implementation("org.bouncycastle:bcmail-jdk16:1.46")
-    implementation("org.bouncycastle:bcmail-jdk18on:1.81")
-    implementation("org.bouncycastle:bcmail-lts8on:2.73.8")
+    implementation("org.bouncycastle:bcmail-jdk18on:1.82")
+    implementation("org.bouncycastle:bcmail-lts8on:2.73.9")
     implementation("org.bouncycastle:bcpg-fips:2.1.11")
     implementation("org.bouncycastle:bcpg-jdk12:130")
-    implementation("org.bouncycastle:bcpg-jdk14:1.81")
+    implementation("org.bouncycastle:bcpg-jdk14:1.82")
     implementation("org.bouncycastle:bcpg-jdk15+:1.46")
     implementation("org.bouncycastle:bcpg-jdk15:1.46")
     implementation("org.bouncycastle:bcpg-jdk15on:1.70")
-    implementation("org.bouncycastle:bcpg-jdk15to18:1.81")
+    implementation("org.bouncycastle:bcpg-jdk15to18:1.82")
     implementation("org.bouncycastle:bcpg-jdk16:1.46")
-    implementation("org.bouncycastle:bcpg-jdk18on:1.81")
-    implementation("org.bouncycastle:bcpg-lts8on:2.73.8")
-    implementation("org.bouncycastle:bcpkix-fips:2.1.9")
-    implementation("org.bouncycastle:bcpkix-jdk14:1.81")
+    implementation("org.bouncycastle:bcpg-jdk18on:1.82")
+    implementation("org.bouncycastle:bcpg-lts8on:2.73.9")
+    implementation("org.bouncycastle:bcpkix-fips:2.1.10")
+    implementation("org.bouncycastle:bcpkix-jdk14:1.82")
     implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
-    implementation("org.bouncycastle:bcpkix-jdk15to18:1.81")
-    implementation("org.bouncycastle:bcpkix-jdk18on:1.81")
-    implementation("org.bouncycastle:bcpkix-lts8on:2.73.8")
-    implementation("org.bouncycastle:bcprov-debug-jdk14:1.81")
+    implementation("org.bouncycastle:bcpkix-jdk15to18:1.82")
+    implementation("org.bouncycastle:bcpkix-jdk18on:1.82")
+    implementation("org.bouncycastle:bcpkix-lts8on:2.73.9")
+    implementation("org.bouncycastle:bcprov-debug-jdk14:1.82")
     implementation("org.bouncycastle:bcprov-debug-jdk15on:1.70")
-    implementation("org.bouncycastle:bcprov-debug-jdk15to18:1.81")
-    implementation("org.bouncycastle:bcprov-debug-jdk18on:1.81")
+    implementation("org.bouncycastle:bcprov-debug-jdk15to18:1.82")
+    implementation("org.bouncycastle:bcprov-debug-jdk18on:1.82")
     implementation("org.bouncycastle:bcprov-ext-debug-jdk14:1.74")
     implementation("org.bouncycastle:bcprov-ext-debug-jdk15on:1.70")
     implementation("org.bouncycastle:bcprov-ext-debug-jdk15to18:1.77")
@@ -188,30 +188,30 @@ dependencies {
     implementation("org.bouncycastle:bcprov-ext-jdk16:1.46")
     implementation("org.bouncycastle:bcprov-ext-jdk18on:1.78.1")
     implementation("org.bouncycastle:bcprov-jdk12:130")
-    implementation("org.bouncycastle:bcprov-jdk14:1.81")
+    implementation("org.bouncycastle:bcprov-jdk14:1.82")
     implementation("org.bouncycastle:bcprov-jdk15+:1.46")
     implementation("org.bouncycastle:bcprov-jdk15:1.46")
     implementation("org.bouncycastle:bcprov-jdk15on:1.70")
-    implementation("org.bouncycastle:bcprov-jdk15to18:1.81")
+    implementation("org.bouncycastle:bcprov-jdk15to18:1.82")
     implementation("org.bouncycastle:bcprov-jdk16:1.46")
-    implementation("org.bouncycastle:bcprov-jdk18on:1.81")
-    implementation("org.bouncycastle:bcprov-lts8on:2.73.8")
-    implementation("org.bouncycastle:bctls-fips:2.1.20")
-    implementation("org.bouncycastle:bctls-jdk14:1.81")
+    implementation("org.bouncycastle:bcprov-jdk18on:1.82")
+    implementation("org.bouncycastle:bcprov-lts8on:2.73.9")
+    implementation("org.bouncycastle:bctls-fips:2.1.22")
+    implementation("org.bouncycastle:bctls-jdk14:1.82")
     implementation("org.bouncycastle:bctls-jdk15on:1.70")
-    implementation("org.bouncycastle:bctls-jdk15to18:1.81")
-    implementation("org.bouncycastle:bctls-jdk18on:1.81")
-    implementation("org.bouncycastle:bctls-lts8on:2.73.8")
+    implementation("org.bouncycastle:bctls-jdk15to18:1.82")
+    implementation("org.bouncycastle:bctls-jdk18on:1.82")
+    implementation("org.bouncycastle:bctls-lts8on:2.73.9")
     implementation("org.bouncycastle:bctsp-jdk14:1.46")
     implementation("org.bouncycastle:bctsp-jdk15+:1.46")
     implementation("org.bouncycastle:bctsp-jdk15:1.46")
     implementation("org.bouncycastle:bctsp-jdk15on:1.46")
     implementation("org.bouncycastle:bctsp-jdk16:1.46")
-    implementation("org.bouncycastle:bcutil-jdk14:1.81")
+    implementation("org.bouncycastle:bcutil-jdk14:1.82")
     implementation("org.bouncycastle:bcutil-jdk15on:1.70")
-    implementation("org.bouncycastle:bcutil-jdk15to18:1.81")
-    implementation("org.bouncycastle:bcutil-jdk18on:1.81")
-    implementation("org.bouncycastle:bcutil-lts8on:2.73.8")
+    implementation("org.bouncycastle:bcutil-jdk15to18:1.82")
+    implementation("org.bouncycastle:bcutil-jdk18on:1.82")
+    implementation("org.bouncycastle:bcutil-lts8on:2.73.9")
     implementation("org.codehaus.woodstox:woodstox-core-asl:4.4.1")
     implementation("org.codehaus.woodstox:woodstox-core-lgpl:4.4.1")
     implementation("org.codehaus.woodstox:wstx-asl:4.0.6")
diff --git a/samples/sample-all/build.out b/samples/sample-all/build.out
index 554a456..7589173 100644
--- a/samples/sample-all/build.out
+++ b/samples/sample-all/build.out
@@ -220,84 +220,84 @@ compileClasspath - Compile classpath for source set 'main'.
 |    +--- org.apache.commons:commons-lang3:3.17.0
 |    \--- org.slf4j:slf4j-api:1.7.36 -> 2.0.17 (*)
 +--- org.apache.velocity:velocity:1.7 -> org.apache.velocity:velocity-engine-core:2.4.1 (*)
-+--- org.bouncycastle:bc-fips-debug:2.1.1 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bc-fips:2.1.1 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcjmail-jdk15on:1.70 -> org.bouncycastle:bcmail-jdk18on:1.81
-|    \--- org.bouncycastle:bcpkix-jdk18on:[1.81,1.82) -> 1.81
-|         \--- org.bouncycastle:bcutil-jdk18on:[1.81,1.82) -> 1.81
-|              \--- org.bouncycastle:bcprov-jdk18on:[1.81,1.82) -> 1.81
-+--- org.bouncycastle:bcjmail-jdk15to18:1.81 -> org.bouncycastle:bcmail-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcjmail-jdk18on:1.81 -> org.bouncycastle:bcmail-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcjmail-lts8on:2.73.8 -> org.bouncycastle:bcmail-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcmail-fips:2.1.6 -> org.bouncycastle:bcmail-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcmail-jdk14:1.81 -> org.bouncycastle:bcmail-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcmail-jdk15+:1.46 -> org.bouncycastle:bcmail-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcmail-jdk15:1.46 -> org.bouncycastle:bcmail-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcmail-jdk15on:1.70 -> org.bouncycastle:bcmail-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcmail-jdk15to18:1.81 -> org.bouncycastle:bcmail-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcmail-jdk16:1.46 -> org.bouncycastle:bcmail-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcmail-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcmail-lts8on:2.73.8 -> org.bouncycastle:bcmail-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcpg-fips:2.1.11 -> org.bouncycastle:bcpg-jdk18on:1.81
-|    +--- org.bouncycastle:bcprov-jdk18on:[1.81,1.82) -> 1.81
-|    \--- org.bouncycastle:bcutil-jdk18on:[1.81,1.82) -> 1.81 (*)
-+--- org.bouncycastle:bcpg-jdk12:130 -> org.bouncycastle:bcpg-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcpg-jdk14:1.81 -> org.bouncycastle:bcpg-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcpg-jdk15+:1.46 -> org.bouncycastle:bcpg-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcpg-jdk15:1.46 -> org.bouncycastle:bcpg-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcpg-jdk15on:1.70 -> org.bouncycastle:bcpg-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcpg-jdk15to18:1.81 -> org.bouncycastle:bcpg-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcpg-jdk16:1.46 -> org.bouncycastle:bcpg-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcpg-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcpg-lts8on:2.73.8 -> org.bouncycastle:bcpg-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcpkix-fips:2.1.9 -> org.bouncycastle:bcpkix-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcpkix-jdk14:1.81 -> org.bouncycastle:bcpkix-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcpkix-jdk15on:1.70 -> org.bouncycastle:bcpkix-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcpkix-jdk15to18:1.81 -> org.bouncycastle:bcpkix-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcpkix-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcpkix-lts8on:2.73.8 -> org.bouncycastle:bcpkix-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcprov-debug-jdk14:1.81 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-debug-jdk15on:1.70 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-debug-jdk15to18:1.81 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-debug-jdk18on:1.81 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-ext-debug-jdk14:1.74 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-ext-debug-jdk15on:1.70 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-ext-debug-jdk15to18:1.77 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-ext-debug-jdk18on:1.77 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-ext-jdk14:1.78.1 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-ext-jdk15:1.46 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-ext-jdk15on:1.70 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-ext-jdk15to18:1.78.1 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-ext-jdk16:1.46 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-ext-jdk18on:1.78.1 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-jdk12:130 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-jdk14:1.81 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-jdk15+:1.46 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-jdk15:1.46 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-jdk15on:1.70 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-jdk15to18:1.81 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-jdk16:1.46 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bcprov-lts8on:2.73.8 -> org.bouncycastle:bcprov-jdk18on:1.81
-+--- org.bouncycastle:bctls-fips:2.1.20 -> org.bouncycastle:bctls-jdk18on:1.81
-|    \--- org.bouncycastle:bcutil-jdk18on:[1.81,1.82) -> 1.81 (*)
-+--- org.bouncycastle:bctls-jdk14:1.81 -> org.bouncycastle:bctls-jdk18on:1.81 (*)
-+--- org.bouncycastle:bctls-jdk15on:1.70 -> org.bouncycastle:bctls-jdk18on:1.81 (*)
-+--- org.bouncycastle:bctls-jdk15to18:1.81 -> org.bouncycastle:bctls-jdk18on:1.81 (*)
-+--- org.bouncycastle:bctls-jdk18on:1.81 (*)
-+--- org.bouncycastle:bctls-lts8on:2.73.8 -> org.bouncycastle:bctls-jdk18on:1.81 (*)
++--- org.bouncycastle:bc-fips-debug:2.1.2 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bc-fips:2.1.2 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcjmail-jdk15on:1.70 -> org.bouncycastle:bcmail-jdk18on:1.82
+|    \--- org.bouncycastle:bcpkix-jdk18on:1.82
+|         \--- org.bouncycastle:bcutil-jdk18on:1.82
+|              \--- org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcjmail-jdk15to18:1.82 -> org.bouncycastle:bcmail-jdk18on:1.82 (*)
++--- org.bouncycastle:bcjmail-jdk18on:1.82 -> org.bouncycastle:bcmail-jdk18on:1.82 (*)
++--- org.bouncycastle:bcjmail-lts8on:2.73.9 -> org.bouncycastle:bcmail-jdk18on:1.82 (*)
++--- org.bouncycastle:bcmail-fips:2.1.6 -> org.bouncycastle:bcmail-jdk18on:1.82 (*)
++--- org.bouncycastle:bcmail-jdk14:1.82 -> org.bouncycastle:bcmail-jdk18on:1.82 (*)
++--- org.bouncycastle:bcmail-jdk15+:1.46 -> org.bouncycastle:bcmail-jdk18on:1.82 (*)
++--- org.bouncycastle:bcmail-jdk15:1.46 -> org.bouncycastle:bcmail-jdk18on:1.82 (*)
++--- org.bouncycastle:bcmail-jdk15on:1.70 -> org.bouncycastle:bcmail-jdk18on:1.82 (*)
++--- org.bouncycastle:bcmail-jdk15to18:1.82 -> org.bouncycastle:bcmail-jdk18on:1.82 (*)
++--- org.bouncycastle:bcmail-jdk16:1.46 -> org.bouncycastle:bcmail-jdk18on:1.82 (*)
++--- org.bouncycastle:bcmail-jdk18on:1.82 (*)
++--- org.bouncycastle:bcmail-lts8on:2.73.9 -> org.bouncycastle:bcmail-jdk18on:1.82 (*)
++--- org.bouncycastle:bcpg-fips:2.1.11 -> org.bouncycastle:bcpg-jdk18on:1.82
+|    +--- org.bouncycastle:bcprov-jdk18on:1.82
+|    \--- org.bouncycastle:bcutil-jdk18on:1.82 (*)
++--- org.bouncycastle:bcpg-jdk12:130 -> org.bouncycastle:bcpg-jdk18on:1.82 (*)
++--- org.bouncycastle:bcpg-jdk14:1.82 -> org.bouncycastle:bcpg-jdk18on:1.82 (*)
++--- org.bouncycastle:bcpg-jdk15+:1.46 -> org.bouncycastle:bcpg-jdk18on:1.82 (*)
++--- org.bouncycastle:bcpg-jdk15:1.46 -> org.bouncycastle:bcpg-jdk18on:1.82 (*)
++--- org.bouncycastle:bcpg-jdk15on:1.70 -> org.bouncycastle:bcpg-jdk18on:1.82 (*)
++--- org.bouncycastle:bcpg-jdk15to18:1.82 -> org.bouncycastle:bcpg-jdk18on:1.82 (*)
++--- org.bouncycastle:bcpg-jdk16:1.46 -> org.bouncycastle:bcpg-jdk18on:1.82 (*)
++--- org.bouncycastle:bcpg-jdk18on:1.82 (*)
++--- org.bouncycastle:bcpg-lts8on:2.73.9 -> org.bouncycastle:bcpg-jdk18on:1.82 (*)
++--- org.bouncycastle:bcpkix-fips:2.1.10 -> org.bouncycastle:bcpkix-jdk18on:1.82 (*)
++--- org.bouncycastle:bcpkix-jdk14:1.82 -> org.bouncycastle:bcpkix-jdk18on:1.82 (*)
++--- org.bouncycastle:bcpkix-jdk15on:1.70 -> org.bouncycastle:bcpkix-jdk18on:1.82 (*)
++--- org.bouncycastle:bcpkix-jdk15to18:1.82 -> org.bouncycastle:bcpkix-jdk18on:1.82 (*)
++--- org.bouncycastle:bcpkix-jdk18on:1.82 (*)
++--- org.bouncycastle:bcpkix-lts8on:2.73.9 -> org.bouncycastle:bcpkix-jdk18on:1.82 (*)
++--- org.bouncycastle:bcprov-debug-jdk14:1.82 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-debug-jdk15on:1.70 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-debug-jdk15to18:1.82 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-debug-jdk18on:1.82 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-ext-debug-jdk14:1.74 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-ext-debug-jdk15on:1.70 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-ext-debug-jdk15to18:1.77 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-ext-debug-jdk18on:1.77 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-ext-jdk14:1.78.1 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-ext-jdk15:1.46 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-ext-jdk15on:1.70 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-ext-jdk15to18:1.78.1 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-ext-jdk16:1.46 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-ext-jdk18on:1.78.1 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-jdk12:130 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-jdk14:1.82 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-jdk15+:1.46 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-jdk15:1.46 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-jdk15on:1.70 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-jdk15to18:1.82 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-jdk16:1.46 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bcprov-lts8on:2.73.9 -> org.bouncycastle:bcprov-jdk18on:1.82
++--- org.bouncycastle:bctls-fips:2.1.22 -> org.bouncycastle:bctls-jdk18on:1.82
+|    \--- org.bouncycastle:bcutil-jdk18on:1.82 (*)
++--- org.bouncycastle:bctls-jdk14:1.82 -> org.bouncycastle:bctls-jdk18on:1.82 (*)
++--- org.bouncycastle:bctls-jdk15on:1.70 -> org.bouncycastle:bctls-jdk18on:1.82 (*)
++--- org.bouncycastle:bctls-jdk15to18:1.82 -> org.bouncycastle:bctls-jdk18on:1.82 (*)
++--- org.bouncycastle:bctls-jdk18on:1.82 (*)
++--- org.bouncycastle:bctls-lts8on:2.73.9 -> org.bouncycastle:bctls-jdk18on:1.82 (*)
 +--- org.bouncycastle:bctsp-jdk14:1.46 -> org.bouncycastle:bctsp-jdk15on:1.46
-|    +--- org.bouncycastle:bcprov-jdk15on:1.46 -> org.bouncycastle:bcprov-jdk18on:1.81
-|    \--- org.bouncycastle:bcmail-jdk15on:1.46 -> org.bouncycastle:bcmail-jdk18on:1.81 (*)
+|    +--- org.bouncycastle:bcprov-jdk15on:1.46 -> org.bouncycastle:bcprov-jdk18on:1.82
+|    \--- org.bouncycastle:bcmail-jdk15on:1.46 -> org.bouncycastle:bcmail-jdk18on:1.82 (*)
 +--- org.bouncycastle:bctsp-jdk15+:1.46 -> org.bouncycastle:bctsp-jdk15on:1.46 (*)
 +--- org.bouncycastle:bctsp-jdk15:1.46 -> org.bouncycastle:bctsp-jdk15on:1.46 (*)
 +--- org.bouncycastle:bctsp-jdk15on:1.46 (*)
 +--- org.bouncycastle:bctsp-jdk16:1.46 -> org.bouncycastle:bctsp-jdk15on:1.46 (*)
-+--- org.bouncycastle:bcutil-jdk14:1.81 -> org.bouncycastle:bcutil-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcutil-jdk15on:1.70 -> org.bouncycastle:bcutil-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcutil-jdk15to18:1.81 -> org.bouncycastle:bcutil-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcutil-jdk18on:1.81 (*)
-+--- org.bouncycastle:bcutil-lts8on:2.73.8 -> org.bouncycastle:bcutil-jdk18on:1.81 (*)
++--- org.bouncycastle:bcutil-jdk14:1.82 -> org.bouncycastle:bcutil-jdk18on:1.82 (*)
++--- org.bouncycastle:bcutil-jdk15on:1.70 -> org.bouncycastle:bcutil-jdk18on:1.82 (*)
++--- org.bouncycastle:bcutil-jdk15to18:1.82 -> org.bouncycastle:bcutil-jdk18on:1.82 (*)
++--- org.bouncycastle:bcutil-jdk18on:1.82 (*)
++--- org.bouncycastle:bcutil-lts8on:2.73.9 -> org.bouncycastle:bcutil-jdk18on:1.82 (*)
 +--- org.codehaus.woodstox:woodstox-core-asl:4.4.1
 |    +--- javax.xml.stream:stax-api:1.0-2 -> stax:stax-api:1.0.1
 |    \--- org.codehaus.woodstox:stax2-api:3.1.4