diff options
| author | Fabian Henneke <FabianHenneke@users.noreply.github.com> | 2020-08-18 07:52:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-18 07:52:27 +0200 |
| commit | b3241f34520cc04d4554a774c1c8315b7cf7da4f (patch) | |
| tree | 951165d0117daa185803ccb78d216618b6e8286e | |
| parent | 14e3754ef33ea0446644d38b3cc0bb812b3ad7dd (diff) | |
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 <me@msfjarvis.dev>
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt | 1 |
1 files changed, 0 insertions, 1 deletions
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) } } |