Skip to content

fix(fips): swap bcprov-jdk18on for bc-fips to enable FIPS 140-3 compliance #132

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.

Sign up for GitHub

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

Merged
mtsvetanov071 merged 2 commits into from
Aug 18, 2026
Merged

fix(fips): swap bcprov-jdk18on for bc-fips to enable FIPS 140-3 compliance #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c7d414
fix(fips): swap bcprov-jdk18on for bc-fips to enable FIPS 140-3 compl…
Aug 11, 2026
be33547
Merge branch 'main' into fips-bcprov-to-bc-fips
mtsvetanov071 Aug 18, 2026
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
14 changes: 7 additions & 7 deletions ...uditlog-ng/src/main/java/com/sap/cds/feature/auditlog/ng/CertificateHttpClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.apache.http.impl.client.HttpClients;
import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
import org.bouncycastle.cert.X509CertificateHolder;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider;
import org.bouncycastle.openssl.PEMParser;
import org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder;
import org.bouncycastle.operator.InputDecryptorProvider;
Expand Down Expand Up @@ -52,9 +52,9 @@ public class CertificateHttpClientConfig {
private static final Logger logger = LoggerFactory.getLogger(CertificateHttpClientConfig.class);

static {
// Register BouncyCastle provider if not already present
if (Security.getProvider("BC") == null) {
Security.addProvider(new BouncyCastleProvider());
// Register BouncyCastle FIPS provider if not already present
if (Security.getProvider("BCFIPS") == null) {
Security.addProvider(new BouncyCastleFipsProvider());
}
}

Expand Down Expand Up @@ -170,11 +170,11 @@ public CertificateHttpClientConfig build() {
private CloseableHttpClient createHttpClient() {
try {
char[] effectivePassphrase = (keyPassphrase != null) ? keyPassphrase.toCharArray() : new char[0];
logger.info("Creating HttpClient with certificate authentication and {} retries", maxRetries);
logger.info("Creating HttpClient with certificate authentication and {} retries (BCFIPS)", maxRetries);
X509Certificate[] certChain = parseCertificateChain(certPem);
PrivateKey privateKey = parsePrivateKey(keyPem, effectivePassphrase);

KeyStore keyStore = KeyStore.getInstance("PKCS12");
KeyStore keyStore = KeyStore.getInstance("PKCS12", "BCFIPS");
keyStore.load(null, null);
keyStore.setKeyEntry("client", privateKey, new char[0], certChain);

Expand Down Expand Up @@ -237,7 +237,7 @@ private static PrivateKey parsePrivateKey(String keyPem, char[] passphrase) thro
return KeyFactory.getInstance("RSA").generatePrivate(keySpec);
} else if (object instanceof PKCS8EncryptedPrivateKeyInfo encInfo) {
try {
InputDecryptorProvider decryptorProvider = new JceOpenSSLPKCS8DecryptorProviderBuilder().build(effectivePassphrase);
InputDecryptorProvider decryptorProvider = new JceOpenSSLPKCS8DecryptorProviderBuilder().setProvider("BCFIPS").build(effectivePassphrase);
PrivateKeyInfo keyInfo = encInfo.decryptPrivateKeyInfo(decryptorProvider);
PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(keyInfo.getEncoded());
return KeyFactory.getInstance("RSA").generatePrivate(keySpec);
Expand Down
25 changes: 20 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@
<mockito.version>5.18.0</mockito.version>
<sdk-bom.version>5.25.0</sdk-bom.version>
<mockito-bom.version>5.21.0</mockito-bom.version>
<bcpkix-jdk18on.version>1.83</bcpkix-jdk18on.version>
<bc-fips.version>2.1.3</bc-fips.version>
<bcpkix-fips.version>2.1.8</bcpkix-fips.version>
<bctls-fips.version>2.1.20</bctls-fips.version>
<bcutil-fips.version>2.1.5</bcutil-fips.version>
</properties>

<groupId>com.sap.cds</groupId>
Expand Down Expand Up @@ -86,14 +89,26 @@
<dependencies>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>${bcpkix-jdk18on.version}</version>
<artifactId>bc-fips</artifactId>
<version>${bc-fips.version}</version>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
<version>${bcpkix-jdk18on.version}</version>
<artifactId>bcpkix-fips</artifactId>
<version>${bcpkix-fips.version}</version>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bctls-fips</artifactId>
<version>${bctls-fips.version}</version>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-fips</artifactId>
<version>${bcutil-fips.version}</version>
</dependency>

<dependency>
Expand Down
Loading