Skip to content

ADFA-2564: Remove Bouncy castle provider from KeyPairGenerator #883

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

Merged
Daniel-ADFA merged 2 commits into from
Jan 27, 2026
Merged

ADFA-2564: Remove Bouncy castle provider from KeyPairGenerator #883

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6cdc32
ADFA-2564: Remove Bouncy castle provider from KeyPairGenerator
Daniel-ADFA Jan 26, 2026
c837173
Merge branch 'stage' into ADFA-2564
Daniel-ADFA Jan 27, 2026
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
8 changes: 3 additions & 5 deletions common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,10 @@ private static void generateKeystore() {

LOG.debug("Generating keystore at: {}", keystorePath);

Security.addProvider(new BouncyCastleProvider());

String storePassword = generateRandomPassword(Environment.KEYSTORE_PWD_LEN);
String keyPassword = storePassword;

KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA", "BC");
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
keyGen.initialize(Environment.KEYSTORE_KEY_SIZE);
KeyPair keyPair = keyGen.generateKeyPair();

Expand All @@ -225,7 +223,7 @@ private static void generateKeystore() {

KeyStore keyStore = KeyStore.getInstance("PKCS12");
keyStore.load(null, null);
keyStore.setKeyEntry(alias, keyPair.getPrivate(), keyPassword.toCharArray(), new java.security.cert.Certificate[]{certificate});
keyStore.setKeyEntry(alias, keyPair.getPrivate(), storePassword.toCharArray(), new java.security.cert.Certificate[]{certificate});

File keystoreFile = new File(keystorePath);
keystoreFile.getParentFile().mkdirs();
Expand All @@ -240,7 +238,7 @@ private static void generateKeystore() {
props.setProperty(Environment.KEYSTORE_PROP_STOREFILE, keystoreFile.getName());
props.setProperty(Environment.KEYSTORE_PROP_STOREPWD, storePassword);
props.setProperty(Environment.KEYSTORE_PROP_KEYALIAS, alias);
props.setProperty(Environment.KEYSTORE_PROP_KEYPWD, keyPassword);
props.setProperty(Environment.KEYSTORE_PROP_KEYPWD, storePassword);

try (FileWriter writer = new FileWriter(propsFile)) {
props.store(writer, "Generated keystore credentials");
Expand Down