Skip to content

[fix] clear BouncyCastle's thread properties on load #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matrei wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[fix] clear BouncyCastle's thread properties on load #395

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/main/java/org/jruby/ext/openssl/OpenSSL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.security.SecureRandom;
import java.util.Map;

import org.bouncycastle.crypto.CryptoServicesRegistrar;
import org.bouncycastle.util.Arrays;
import org.jruby.*;
import org.jruby.anno.JRubyMethod;
Expand Down Expand Up @@ -72,11 +73,23 @@ static void doLoad(final Ruby runtime, final boolean fipsGem) {
SecurityHelper.setFipsVariant(fipsGem);
SecurityHelper.checkAndRegisterProviderOnce();
LoggingSupport.silenceBouncyCastleLoggers();
clearBouncyCastleThreadProperties();

createOpenSSL(runtime);
loaded = true;
}

/**
* BouncyCastle's {@code CryptoServicesRegistrar} sets its default DSA and DH parameters globally, and in a
* thread-local for the thread that initializes it (bcgit/bc-java#2536). That thread then keeps BouncyCastle's class
* loader alive for as long as it lives, and with it the class loader of an embedded JRuby. Lookups fall back to the
* global values, so the thread's copies can go. This also initializes the registrar on this thread, if needed.
*/
private static void clearBouncyCastleThreadProperties() {
CryptoServicesRegistrar.clearThreadProperty(CryptoServicesRegistrar.Property.DSA_DEFAULT_PARAMS);
CryptoServicesRegistrar.clearThreadProperty(CryptoServicesRegistrar.Property.DH_DEFAULT_PARAMS);
}

public static boolean isLoaded() {
return loaded;
}
Expand Down
Loading