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

[JEP-237] Do not support shortening of HMAC code on FIPS mode #8612

Merged
merged 5 commits into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions core/src/main/java/jenkins/security/HMACConfidentialKey.java
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@
}

private byte[] chop(byte[] mac) {
//don't shorten the mac code on FIPS mode
//if length supplied is less than original mac code length on FIPS, throw exception
if (FIPS140.useCompliantAlgorithms() && length < mac.length) {

Check warning on line 103 in core/src/main/java/jenkins/security/HMACConfidentialKey.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Partially covered line

Line 103 is only partially covered, 3 branches are missing
throw new IllegalArgumentException("Supplied length can't be less than " + mac.length + " on FIPS mode");

Check warning on line 104 in core/src/main/java/jenkins/security/HMACConfidentialKey.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line

Line 104 is not covered by tests
}
if (mac.length <= length) return mac; // already too short

byte[] b = new byte[length];
Expand Down
37 changes: 37 additions & 0 deletions core/src/test/java/jenkins/security/HMACConfidentialKeyTest.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package jenkins.security;


import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

import java.util.Set;
import java.util.TreeSet;
Expand Down Expand Up @@ -38,4 +40,39 @@ public void loadingExistingKey() {
}
}


@Test
public void testMacWithShortenedCodeOnFips() {
SujathaH marked this conversation as resolved.
Show resolved Hide resolved
System.setProperty("jenkins.security.FIPS140.COMPLIANCE", "true");
HMACConfidentialKey key1 = new HMACConfidentialKey("test", 16);
try {
String str = key1.mac("Hello World");
} catch (IllegalArgumentException exception) {
assertEquals("Supplied length can't be less than 32 on FIPS mode", exception.getMessage());
}
}
SujathaH marked this conversation as resolved.
Show resolved Hide resolved

@Test
public void testMacWithShortenedCodeOnNonFips() {
SujathaH marked this conversation as resolved.
Show resolved Hide resolved
System.setProperty("jenkins.security.FIPS140.COMPLIANCE", "false");
SujathaH marked this conversation as resolved.
Show resolved Hide resolved
HMACConfidentialKey key1 = new HMACConfidentialKey("test", 16);
try {
String str = key1.mac("Hello World");
assertTrue(str, str.matches("[0-9A-Fa-f]{32}"));
} catch (IllegalArgumentException exception) {
fail("Found IllegalArgumentException");
}
SujathaH marked this conversation as resolved.
Show resolved Hide resolved
}

@Test
public void testCompleteMaCodeOnNonFips() {
System.setProperty("jenkins.security.FIPS140.COMPLIANCE", "true");
SujathaH marked this conversation as resolved.
Show resolved Hide resolved
HMACConfidentialKey key1 = new HMACConfidentialKey("test", 32);
try {
String str = key1.mac("Hello World");
assertTrue(str, str.matches("[0-9A-Fa-f]{64}"));
} catch (IllegalArgumentException exception) {
SujathaH marked this conversation as resolved.
Show resolved Hide resolved
fail("Found IllegalArgumentException");
}
}
}
Loading