minimize changes

BrightSpots · Feb 1, 2024 · f3e8565 · f3e8565
1 parent c15bf17
commit f3e8565
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id "application"
     id "checkstyle"
     // Latest version at: https://github.com/spotbugs/spotbugs-gradle-plugin/tags
-    id "com.github.spotbugs" version "6.0.3"
+    id "com.github.spotbugs" version "5.0.9"
     id "idea"
     id "java-library"
     id "org.beryx.jlink" version "2.25.0"
@@ -23,7 +23,6 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
     implementation 'org.bouncycastle:bc-fips:1.0.2.3'
-    implementation "com.github.spotbugs:spotbugs:4.8.3"
 }
 
 // ### Application plugin settings
@@ -60,7 +59,7 @@ System.setProperty("org.checkstyle.google.suppressionfilter.config",
 
 spotbugs {
     // Latest version at: https://github.com/spotbugs/spotbugs/tags
-    toolVersion = '4.8.3'
+    toolVersion = '4.7.1'
     excludeFilter = file("config/spotbugs/exclude.xml")
 }
 

diff --git a/config/spotbugs/exclude.xml b/config/spotbugs/exclude.xml
@@ -30,12 +30,4 @@
     <Field name="xmlns"/>
     <Bug code="UrF"/>
   </Match>
-  <Match>
-    <Class name="network.brightspots.rcv.StreamingCvrReader"/>
-    <Bug code="CT"/>
-  </Match>
-  <Match>
-    <Class name="network.brightspots.rcv.Tabulator"/>
-    <Bug code="CT"/>
-  </Match>
 </FindBugsFilter>
diff --git a/src/main/java/network/brightspots/rcv/SecurityConfig.java b/src/main/java/network/brightspots/rcv/SecurityConfig.java
@@ -107,8 +107,10 @@ private static void setupAndVerifyFipsCompliance() throws SecurityConfigurationE
     try {
       String randomProviderName =
             java.security.SecureRandom.getInstanceStrong().getProvider().getName();
-      if (!randomProviderName.equals(expectedSecureRandomProvider)) {
-        Logger.warning("The SecureRandom provider is " + randomProviderName);
+      if (!randomProviderName.equals(expectedSecureRandomProvider)
+          && randomProviderName.equals(new BouncyCastleFipsProvider())) {
+        throw new SecurityConfigurationException("Unexpected SecureRandom provider"
+            + randomProviderName);
       }
     } catch (NoSuchAlgorithmException e) {
       throw new SecurityConfigurationException("No SecureRandom algorithm found.");