mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-08-29 13:27:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Temporarily work around SSHJ compatibility issues (#1142)

Browse Source 
Using ECDSA either as a key exchange or a host key algorithm fails with
SSHJ 0.30.0 on Android, but should again become possible in 0.31.0.

While we wait for the release, demote ECDSA in the list of key
algorithms (as it should still be available for public key auth) and
remove it from the list of key exchange algorithms.

(cherry picked from commit 0d2788ab54b7898c88e8dc03d88323d70781a795)
This commit is contained in:
Fabian Henneke 2020-10-08 17:54:18 +02:00 committed by Harsh Shandilya
parent c70c1792f6
commit 6139693d4f
No known key found for this signature in database
GPG Key ID: 366D7BBAD1031E80
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/zeapo/pwdstore/git/sshj/SshjConfig.kt
View File

@ -214,9 +214,6 @@ class SshjConfig : ConfigImpl() {
keyExchangeFactories = listOf( keyExchangeFactories = listOf(
Curve25519SHA256.Factory(), Curve25519SHA256.Factory(),
FactoryLibSsh(), FactoryLibSsh(),
ECDHNistP.Factory521(),
ECDHNistP.Factory384(),
ECDHNistP.Factory256(),
DHGexSHA256.Factory(), DHGexSHA256.Factory(),
// Sends "ext-info-c" with the list of key exchange algorithms. This is needed to get // Sends "ext-info-c" with the list of key exchange algorithms. This is needed to get
// rsa-sha2-* key types to work with some servers (e.g. GitHub). // rsa-sha2-* key types to work with some servers (e.g. GitHub).
@ -230,10 +227,10 @@ class SshjConfig : ConfigImpl() {
KeyAlgorithms.EdDSA25519(), KeyAlgorithms.EdDSA25519(),
KeyAlgorithms.RSASHA512(), KeyAlgorithms.RSASHA512(),
KeyAlgorithms.RSASHA256(), KeyAlgorithms.RSASHA256(),
KeyAlgorithms.SSHRSA(),
KeyAlgorithms.ECDSASHANistp521(), KeyAlgorithms.ECDSASHANistp521(),
KeyAlgorithms.ECDSASHANistp384(), KeyAlgorithms.ECDSASHANistp384(),
KeyAlgorithms.ECDSASHANistp256(), KeyAlgorithms.ECDSASHANistp256(),
KeyAlgorithms.SSHRSA(),
).map { ).map {
OpenKeychainWrappedKeyAlgorithmFactory(it) OpenKeychainWrappedKeyAlgorithmFactory(it)
} }