Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for JuiceSSH generated ed25519 keys #770

Merged

Conversation

TranceLove
Copy link
Contributor

@TranceLove TranceLove commented Mar 5, 2022

Reported from TeamAmaze/AmazeFileManager#2976, it was found the key uses aes-128-cbc which is currently not supported by sshj. This change adds support for it.

To enable support for this, also eliminated hardcoding byte array size for key and IV, as a result of BCrypt.pbkdf().

Reported from TeamAmaze/AmazeFileManager#2976, it was found the key uses aes-128-cbc which is currently not supported by sshj. This change adds support for it.

To enable support for this, also eliminated hardcoding byte array size for key and IV, as a result of BCrypt.pbkdf().
@TranceLove TranceLove force-pushed the bugfix/ed25519-encrypted-keys branch from cc9c68b to a90ef6e Compare March 5, 2022 09:52
@codecov-commenter
Copy link

codecov-commenter commented Mar 5, 2022

Codecov Report

Merging #770 (cc9c68b) into master (9a939d0) will increase coverage by 0.07%.
The diff coverage is 80.00%.

❗ Current head cc9c68b differs from pull request most recent head a90ef6e. Consider uploading reports for the commit a90ef6e to get more accurate results

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #770      +/-   ##
============================================
+ Coverage     64.39%   64.47%   +0.07%     
- Complexity     1459     1461       +2     
============================================
  Files           211      211              
  Lines          8615     8617       +2     
  Branches        806      807       +1     
============================================
+ Hits           5548     5556       +8     
+ Misses         2643     2639       -4     
+ Partials        424      422       -2     
Impacted Files Coverage Δ
...sshj/userauth/keyprovider/OpenSSHKeyV1KeyFile.java 83.10% <80.00%> (+0.23%) ⬆️
...t/schmizz/sshj/connection/ConnectionException.java 33.33% <0.00%> (-11.12%) ⬇️
...zz/sshj/connection/channel/ChannelInputStream.java 86.15% <0.00%> (-3.08%) ⬇️
.../main/java/net/schmizz/sshj/sftp/PacketReader.java 95.74% <0.00%> (+4.25%) ⬆️
...ain/java/net/schmizz/sshj/common/SSHException.java 74.19% <0.00%> (+12.90%) ⬆️
...net/schmizz/sshj/transport/TransportException.java 55.55% <0.00%> (+22.22%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9a939d0...a90ef6e. Read the comment docs.

@hierynomus
Copy link
Owner

Thanks, changes look good. Consider it merged!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants