From b3241f34520cc04d4554a774c1c8315b7cf7da4f Mon Sep 17 00:00:00 2001 From: Fabian Henneke Date: Tue, 18 Aug 2020 07:52:27 +0200 Subject: Preserve SSH key passphrase on connection errors (#979) * Update sshj to 0.30.0 and improve algorithm order Updates sshj to 0.30.0, which brings support for rsa-sha2-* key types and bugfixes related to RSA certificates and Android Keystore backed keys. Along the way, this improves the algorithm preferences to be consistent with the Mozilla Intermediate SSH configuration (as far as possible, given that most certificate types and some encryption algorithms are not yet supported). We also add "ext-info-c" to the kex algorithm proposal to work around certain kinds of "user agent sniffing" that limits the support of rsa-sha2-* key types. * Preserve SSH key passphrase on connection errors Co-authored-by: Harsh Shandilya --- app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt index e72c5743..881b8807 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt +++ b/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt @@ -157,7 +157,6 @@ abstract class GitOperation(gitDir: File, internal val callingActivity: Fragment } is SshjSessionFactory -> { callingActivity.getEncryptedPrefs("git_operation").edit { - remove(PreferenceKeys.SSH_KEY_LOCAL_PASSPHRASE) remove(PreferenceKeys.HTTPS_PASSWORD) } } -- cgit v1.2.3