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>
This commit is contained in:
Fabian Henneke 2020-08-18 07:52:27 +02:00 committed by GitHub
parent 14e3754ef3
commit b3241f3452
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -157,7 +157,6 @@ abstract class GitOperation(gitDir: File, internal val callingActivity: Fragment
} }
is SshjSessionFactory -> { is SshjSessionFactory -> {
callingActivity.getEncryptedPrefs("git_operation").edit { callingActivity.getEncryptedPrefs("git_operation").edit {
remove(PreferenceKeys.SSH_KEY_LOCAL_PASSPHRASE)
remove(PreferenceKeys.HTTPS_PASSWORD) remove(PreferenceKeys.HTTPS_PASSWORD)
} }
} }