This is an automated email from the ASF dual-hosted git repository.
pifta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new d767b0dc26 HDDS-10691. CRYPTO_COMPLIANCE tag for cryptography
parameters (#6538)
d767b0dc26 is described below
commit d767b0dc264e7e959f10d375a8e62f6c7a539e60
Author: Galsza <[email protected]>
AuthorDate: Thu Apr 25 16:49:01 2024 +0200
HDDS-10691. CRYPTO_COMPLIANCE tag for cryptography parameters (#6538)
---
.../common/src/main/resources/ozone-default.xml | 27 ++++++++++++++++++----
.../hadoop/ozone/TestOzoneConfigurationFields.java | 2 --
2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml
b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index ae8b0094be..480a33333b 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -2246,9 +2246,26 @@
<property>
<name>hdds.key.len</name>
<value>2048</value>
- <tag>SCM, HDDS, X509, SECURITY</tag>
+ <tag>SCM, HDDS, X509, SECURITY, CRYPTO_COMPLIANCE</tag>
+ <description>
+ SCM CA key length. This is an algorithm-specific metric, such as modulus
+ length, specified in number of bits.
+ </description>
+ </property>
+ <property>
+ <name>hdds.key.algo</name>
+ <value>RSA</value>
+ <tag>SCM, HDDS, X509, SECURITY, CRYPTO_COMPLIANCE</tag>
+ <description>
+ SCM CA key algorithm.
+ </description>
+ </property>
+ <property>
+ <name>hdds.security.provider</name>
+ <value>BC</value>
+ <tag>OZONE, HDDS, X509, SECURITY, CRYPTO_COMPLIANCE</tag>
<description>
- SCM CA key length. This is an algorithm-specific metric, such as
modulus length, specified in number of bits.
+ The main security provider used for various cryptographic algorithms.
</description>
</property>
<property>
@@ -2292,7 +2309,7 @@
<property>
<name>hdds.grpc.tls.provider</name>
<value>OPENSSL</value>
- <tag>OZONE, HDDS, SECURITY, TLS</tag>
+ <tag>OZONE, HDDS, SECURITY, TLS, CRYPTO_COMPLIANCE</tag>
<description>HDDS GRPC server TLS provider.</description>
</property>
<property>
@@ -2336,7 +2353,7 @@
<property>
<name>hdds.x509.signature.algorithm</name>
<value>SHA256withRSA</value>
- <tag>OZONE, HDDS, SECURITY</tag>
+ <tag>OZONE, HDDS, SECURITY, CRYPTO_COMPLIANCE</tag>
<description>X509 signature certificate.</description>
</property>
<property>
@@ -4349,7 +4366,7 @@
<property>
<name>hdds.secret.key.algorithm</name>
<value>HmacSHA256</value>
- <tag>SCM, SECURITY</tag>
+ <tag>SCM, SECURITY, CRYPTO_COMPLIANCE</tag>
<description>
The algorithm that SCM uses to generate symmetric secret keys.
A valid algorithm is the one supported by KeyGenerator, as described at
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
index 2b53f40dac..8087d1f0e4 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestOzoneConfigurationFields.java
@@ -84,8 +84,6 @@ public class TestOzoneConfigurationFields extends
TestConfigurationFieldsBase {
configurationPropsToSkipCompare.addAll(Arrays.asList(
HddsConfigKeys.HDDS_CONTAINER_PERSISTDATA,
HddsConfigKeys.HDDS_GRPC_TLS_TEST_CERT,
- HddsConfigKeys.HDDS_KEY_ALGORITHM,
- HddsConfigKeys.HDDS_SECURITY_PROVIDER,
HddsConfigKeys.HDDS_X509_CRL_NAME, // HDDS-2873
HddsConfigKeys.HDDS_X509_GRACE_DURATION_TOKEN_CHECKS_ENABLED,
OMConfigKeys.OZONE_OM_NODES_KEY,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
