Merge pull request #1165 from jbonofre/AMQ-9431

AMQ-9431: Add org.apache.activemq.broker.BouncyCastleNotAdded system property to not load BouncyCastle in BrokerService
apache · Mar 3, 2024 · a2fa433 · a2fa433
2 parents dcb660f + 0a90f32
commit a2fa433
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -271,17 +271,20 @@ public class BrokerService implements Service {
     static {
 
         try {
-            ClassLoader loader = BrokerService.class.getClassLoader();
-            Class<?> clazz = loader.loadClass("org.bouncycastle.jce.provider.BouncyCastleProvider");
-            Provider bouncycastle = (Provider) clazz.getDeclaredConstructor().newInstance();
-            Integer bouncyCastlePosition = Integer.getInteger("org.apache.activemq.broker.BouncyCastlePosition");
-            int ret;
-            if (bouncyCastlePosition != null) {
-                ret = Security.insertProviderAt(bouncycastle, bouncyCastlePosition);
-            } else {
-                ret = Security.addProvider(bouncycastle);
+            Boolean bouncyCastleNotAdded = Boolean.getBoolean("org.apache.activemq.broker.BouncyCastleNotAdded");
+            if (bouncyCastleNotAdded == null || bouncyCastleNotAdded == false) {
+                ClassLoader loader = BrokerService.class.getClassLoader();
+                Class<?> clazz = loader.loadClass("org.bouncycastle.jce.provider.BouncyCastleProvider");
+                Provider bouncycastle = (Provider) clazz.getDeclaredConstructor().newInstance();
+                Integer bouncyCastlePosition = Integer.getInteger("org.apache.activemq.broker.BouncyCastlePosition");
+                int ret;
+                if (bouncyCastlePosition != null) {
+                    ret = Security.insertProviderAt(bouncycastle, bouncyCastlePosition);
+                } else {
+                    ret = Security.addProvider(bouncycastle);
+                }
+                LOG.info("Loaded the Bouncy Castle security provider at position: {}", ret);
             }
-            LOG.info("Loaded the Bouncy Castle security provider at position: {}", ret);
         } catch(Throwable e) {
             // No BouncyCastle found so we use the default Java Security Provider
         }