Move BCrypt class to avoid conflict with org.mindrot:jbcrypt #717
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Renamed BCryptTest and updated using JUnit Test annotations
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As described in issue #706, the class name of
org.mindrot.jbcrypt.BCryptconflicts with a class of the same name in the originalorg.mindrot:jbcryptlibrary. With the SSHJ BCrypt class implementing the additionalpbkdf()method, the two classes are not interchangeable. Relocating theBCryptclass under thecom.hierynomus.sshjpackage structure avoids class path conflicts in applications that have dependencies on both SSHJ and JBcrypt libraries. Additional changes include renaming and updating theBCryptTestclass to use standard JUnit Test annotations.