-
-
Notifications
You must be signed in to change notification settings - Fork 8.8k
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
[JEP-237] Do not support shortening of HMAC code on FIPS mode #8612
Merged
timja
merged 5 commits into
jenkinsci:master
from
SujathaH:shitnal_hmacconfidential_key
Oct 19, 2023
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
e95120b
Do not support shortening of HMAC code
SujathaH dd258b1
Moved FIPS related unit test cases to a new file
SujathaH 54477f0
Moved FIPS related unit test cases to a new file
SujathaH 1a473c6
Moved FIPS related unit test cases to a new file
SujathaH 7730828
Fixed checkstyle issues in junit
SujathaH File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
33 changes: 33 additions & 0 deletions
33
test/src/test/java/hudson/security/HMACConfidentialKeyFIPSTest.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
package hudson.security; | ||
|
||
import static org.hamcrest.MatcherAssert.assertThat; | ||
import static org.hamcrest.Matchers.matchesPattern; | ||
import static org.junit.Assert.assertEquals; | ||
import static org.junit.Assert.assertThrows; | ||
|
||
import jenkins.security.HMACConfidentialKey; | ||
import org.junit.ClassRule; | ||
import org.junit.Test; | ||
import org.junit.rules.TestRule; | ||
import org.jvnet.hudson.test.FlagRule; | ||
|
||
public class HMACConfidentialKeyFIPSTest { | ||
@ClassRule | ||
// do not use the FIPS140 class here as that initializes the field before we set the property! | ||
public static TestRule flagRule = FlagRule.systemProperty("jenkins.security.FIPS140.COMPLIANCE", "true"); | ||
|
||
@Test | ||
public void testTruncatedMacOnFips() { | ||
HMACConfidentialKey key1 = new HMACConfidentialKey("test", 16); | ||
IllegalArgumentException iae = assertThrows(IllegalArgumentException.class, () -> key1.mac("Hello World")); | ||
assertEquals("Supplied length can't be less than 32 on FIPS mode", iae.getMessage()); | ||
} | ||
|
||
@Test | ||
public void testCompleteMacOnFips() { | ||
HMACConfidentialKey key1 = new HMACConfidentialKey("test", 32); | ||
String str = key1.mac("Hello World"); | ||
String pattern = "[0-9A-Fa-f]{64}"; | ||
assertThat(str, matchesPattern(pattern)); | ||
} | ||
} |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how about make a var as "Hello World"?