Skip to content

Commit b46f889

Browse files
remove: maverick-bc; use bc directly as workaround for now
1 parent 255aaf0 commit b46f889

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

src/plugins/sftp/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<framework src="commons-io:commons-io:2.11.0" />
2828
<framework src="com.sshtools:maverick-synergy-client:3.1.2" />
29-
<framework src="com.sshtools:maverick-bc:3.1.2" />
29+
<!-- <framework src="com.sshtools:maverick-bc:3.1.2" />-->
3030
<framework src="org.bouncycastle:bcprov-jdk15to18:1.79" />
3131
<framework src="org.bouncycastle:bcpkix-jdk15to18:1.79" />
3232
</plugin>

src/plugins/sftp/src/com/foxdebug/sftp/Sftp.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,17 @@ public void run() {
182182
InputStream in = contentResolver.openInputStream(uri);
183183

184184
com.sshtools.common.logger.Log.getDefaultContext().enableFile(com.sshtools.common.logger.Log.Level.DEBUG, new File("/storage/emulated/0/Android/data/com.foxdebug.acode/synergy.log"));
185-
JCEProvider.enableBouncyCastle(true);
185+
// JCEProvider.enableBouncyCastle(false);
186186

187187
Log.i(TAG, "All Available Security Providers (Security.getProviders() : " + Arrays.toString(Security.getProviders()));
188188
Log.i(TAG, "All Available Security Providers for ED25519 (Security.getProviders(\"KeyPairGenerator.Ed25519\"\") : " + Arrays.toString(Security.getProviders("KeyPairGenerator.Ed25519")));
189189
Log.i(TAG, "BC Security Provider Name (`Security.getProvider(BouncyCastleProvider.PROVIDER_NAME)`) : " + Security.getProvider(BouncyCastleProvider.PROVIDER_NAME));
190+
Security.removeProvider("BC");
191+
Security.insertProviderAt(new BouncyCastleProvider(), 1);
192+
193+
Log.i(TAG, "(After Inserting BC) All Available Security Providers (Security.getProviders() : " + Arrays.toString(Security.getProviders()));
194+
Log.i(TAG, "(After Inserting BC) All Available Security Providers for ED25519 (Security.getProviders(\"KeyPairGenerator.Ed25519\"\") : " + Arrays.toString(Security.getProviders("KeyPairGenerator.Ed25519")));
195+
Log.i(TAG, "(After Inserting BC) BC Security Provider Name (`Security.getProvider(BouncyCastleProvider.PROVIDER_NAME)`) : " + Security.getProvider(BouncyCastleProvider.PROVIDER_NAME));
190196

191197
SshKeyPair keyPair = null;
192198
try {

0 commit comments

Comments
 (0)