Update smbj and bouncy castle to support SMBv3 #182
Merged
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
compliance-r7
previously approved these changes
Apr 24, 2024
mgrundie-r7
previously approved these changes
Apr 29, 2024
rkirk-r7
previously approved these changes
Apr 30, 2024
ekelly-1898
dismissed stale reviews from rkirk-r7, mgrundie-r7, and compliance-r7
via
b24506a
removed temporary identifier
Replaced bouncy castle hex function with functionality from guava that we use for other functions
rkirk-r7
reviewed
Sep 12, 2024
| @@ -76,7 +76,7 @@ public static ContextHandle fromHex(final String hString) { | |||
| if (hString == null || hString.length() > (bytes.length * 2)) { | |||
| throw new IllegalArgumentException("hString is invalid: " + hString); | |||
| } | |||
| final byte[] handle = Hex.decode(hString); | |||
| final byte[] handle = BaseEncoding.base16().decode(hString.toUpperCase()); | |||
There was a problem hiding this comment.
Does it require being upper case to decode then? As we are not obviously uppercasing in the other usages
There was a problem hiding this comment.
The BaseEncoding encodes and decodes using uppercase characters by default.
BaseEncoding.base16().decode
| @@ -132,7 +135,7 @@ public String getDataAsBinaryStr() { | |||
| } | |||
|
|
|||
| public String getDataAsHexStr() { | |||
| return Hex.toHexString(data).toUpperCase(); | |||
| return BaseEncoding.base16().encode(data); //Hex.toHexString(data).toUpperCase(); | |||
There was a problem hiding this comment.
remove comment
Should this still uppercase the encoded data or is that defaulted to?
There was a problem hiding this comment.
it defaults to uppercase
Base Encoding
dbeliakov-r7
approved these changes
Sep 13, 2024
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.
Description
Upgrade SMBJ to support SMBv3.
Motivation and Context
Explanation of why these changes are being proposed, including any links to other relevant issues or pull requests.
How Has This Been Tested?
Integration tests succeed.