Add BouncyCastleProvider as security provider to prevent NPE (apache#…

…9601)
sarvex · Feb 18, 2021 · 28585e2 · 28585e2
1 parent 2e08766
commit 28585e2
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...-messagecrypto-bc/src/main/java/org/apache/pulsar/client/impl/crypto/MessageCryptoBc.java b/...-messagecrypto-bc/src/main/java/org/apache/pulsar/client/impl/crypto/MessageCryptoBc.java
@@ -37,6 +37,7 @@
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.SecureRandom;
+import java.security.Security;
 import java.security.spec.InvalidKeySpecException;
 import java.util.HashMap;
 import java.util.List;
@@ -123,6 +124,11 @@ public class MessageCryptoBc implements MessageCrypto<MessageMetadata, MessageMe
 
         // Initial seed
         secureRandom.nextBytes(new byte[IV_LEN]);
+
+        // Add provider only if it's not in the JVM
+        if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null) {
+            Security.addProvider(new BouncyCastleProvider());
+        }
     }
 
     public MessageCryptoBc(String logCtx, boolean keyGenNeeded) {