From 0505fc5833dfc17b69bcb12e2c28e4e07a7b339f Mon Sep 17 00:00:00 2001
From: Yuriy Movchan <Yuriy.Movchan@gmail.com>
Date: Fri, 29 Jul 2022 16:59:10 +0000
Subject: [PATCH] Revert "Check if BC FIPS provider exists before loading it"
---
opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java b/opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java
index 4b10875..dd453b0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java
@@ -64,11 +64,6 @@
public static final String KEY_STORE_TYPE_PKCS12 = "PKCS12";
/**
- * The key store type value that should be used for the "BCFKS" key store.
- */
- public static final String KEY_STORE_TYPE_BCFKS = "BCFKS";
-
- /**
* The key store path value that must be used in conjunction with the PKCS11
* key store type.
*/
@@ -162,7 +157,7 @@
}
} else if (keyStoreType.equals(KEY_STORE_TYPE_JKS) ||
keyStoreType.equals(KEY_STORE_TYPE_JCEKS) ||
- keyStoreType.equals(KEY_STORE_TYPE_PKCS12) || keyStoreType.equals(KEY_STORE_TYPE_BCFKS)) {
+ keyStoreType.equals(KEY_STORE_TYPE_PKCS12)) {
File keyStoreFile = new File(keyStorePath);
if (keyStoreFile.exists()) {
if (! keyStoreFile.isFile()) {
@@ -179,7 +174,7 @@
} else {
LocalizableMessage msg = ERR_CERTMGR_INVALID_STORETYPE.get(
KEY_STORE_TYPE_JKS, KEY_STORE_TYPE_JCEKS,
- KEY_STORE_TYPE_PKCS11, KEY_STORE_TYPE_PKCS12, KEY_STORE_TYPE_BCFKS);
+ KEY_STORE_TYPE_PKCS11, KEY_STORE_TYPE_PKCS12);
throw new IllegalArgumentException(msg.toString());
}
this.keyStorePath = keyStorePath;
@@ -382,8 +377,7 @@
FileInputStream keyStoreInputStream = null;
if (keyStoreType.equals(KEY_STORE_TYPE_JKS) ||
keyStoreType.equals(KEY_STORE_TYPE_JCEKS) ||
- keyStoreType.equals(KEY_STORE_TYPE_PKCS12) ||
- keyStoreType.equals(KEY_STORE_TYPE_BCFKS))
+ keyStoreType.equals(KEY_STORE_TYPE_PKCS12))
{
final File keyStoreFile = new File(keyStorePath);
if (! keyStoreFile.exists())
--
Gitblit v1.10.0