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 ChaCha20-Poly1305 Support for OpenSSH Keys #904

Merged

Conversation

exceptionfactory
Copy link
Contributor

This pull request adds support for the chacha20-poly1305@openssh.com cipher when decrypting OpenSSH Private Keys.

The implementation required adjusting the ChachaPolyCipher.update() method to accept an input offset of 0, indicating no Additional Authenticated Data included with the encrypted bytes.

- Updated ChachaPolyCipher to support decryption without Additional Authenticated Data
@codecov-commenter
Copy link

codecov-commenter commented Oct 16, 2023

Codecov Report

Merging #904 (32b4e12) into master (3b67d2b) will decrease coverage by 0.02%.
The diff coverage is 92.85%.

@@             Coverage Diff              @@
##             master     #904      +/-   ##
============================================
- Coverage     68.45%   68.44%   -0.02%     
+ Complexity     1402     1400       -2     
============================================
  Files           207      207              
  Lines          7475     7478       +3     
  Branches        630      631       +1     
============================================
+ Hits           5117     5118       +1     
- Misses         2023     2024       +1     
- Partials        335      336       +1     
Files Coverage Δ
...sshj/userauth/keyprovider/OpenSSHKeyV1KeyFile.java 86.45% <100.00%> (+0.07%) ⬆️
...ynomus/sshj/transport/cipher/ChachaPolyCipher.java 77.94% <91.66%> (+0.66%) ⬆️

... and 8 files with indirect coverage changes

@hierynomus hierynomus merged commit 542bb35 into hierynomus:master Oct 16, 2023
5 of 6 checks passed
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.

None yet

3 participants