Update by review

Change-Id: I8feab0406d46892daa954a1e41eb193f031ee77a

Author: K0K0V0K

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java

@@ -1005,20 +1005,13 @@ public class CommonConfigurationKeysPublic {
   public static final String  HADOOP_SECURITY_CREDENTIAL_PASSWORD_FILE_KEY =
       "hadoop.security.credstore.java-keystore-provider.password-file";
 
-  /**
-   * @see
-   * <a href="{@docRoot}/../hadoop-project-dist/hadoop-common/core-default.xml">
-   * core-default.xml</a>
-   */
-  public static final String HMAC_ALGORITHM = "hadoop.security.hmac-algorithm";
-  public static final String DEFAULT_HMAC_ALGORITHM = "HmacSHA1";
+  public static final String HADOOP_SECURITY_SECRET_MANAGER_KEY_GENERATOR_ALGORITHM_KEY =
+    "secret-manager.key-generator.algorith";
+  public static final String HADOOP_SECURITY_SECRET_MANAGER_KEY_GENERATOR_ALGORITHM_DEFAULT =
+    "HmacSHA1";
 
-  /**
-   * @see
-   * <a href="{@docRoot}/../hadoop-project-dist/hadoop-common/core-default.xml">
-   * core-default.xml</a>
-   */
-  public static final String HMAC_LENGTH = "hadoop.security.hmac-length";
+  public static final String HADOOP_SECURITY_SECRET_MANAGER_KEY_LENGTH_KEY =
+    "hadoop.security.secret-manager.key-length";
   public static final int DEFAULT_HMAC_LENGTH = 64;
 
   /**

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/SecretManager.java

@@ -121,12 +121,12 @@ public void checkAvailableForRead() throws StandbyException {
   static {
     Configuration conf = new Configuration();
     String algorithm = conf.get(
-      CommonConfigurationKeysPublic.HMAC_ALGORITHM,
-      CommonConfigurationKeysPublic.DEFAULT_HMAC_ALGORITHM);
+      CommonConfigurationKeysPublic.HADOOP_SECURITY_SECRET_MANAGER_KEY_GENERATOR_ALGORITHM_KEY,
+      CommonConfigurationKeysPublic.HADOOP_SECURITY_SECRET_MANAGER_KEY_GENERATOR_ALGORITHM_DEFAULT);
     LOG.info("Selected hash algorithm: {}", algorithm);
     SELECTED_ALGORITHM = algorithm;
     int length = conf.getInt(
-      CommonConfigurationKeysPublic.HMAC_LENGTH,
+      CommonConfigurationKeysPublic.HADOOP_SECURITY_SECRET_MANAGER_KEY_LENGTH_KEY,
       CommonConfigurationKeysPublic.DEFAULT_HMAC_LENGTH);
     LOG.info("Selected hash key length:{}", length);
     SELECTED_LENGTH = length;
@@ -142,7 +142,7 @@ protected Mac initialValue() {
       try {
         return Mac.getInstance(SELECTED_ALGORITHM);
       } catch (NoSuchAlgorithmException nsa) {
-        throw new IllegalArgumentException("Can't find " + SELECTED_ALGORITHM + " algorithm.");
+        throw new IllegalArgumentException("Can't find " + SELECTED_ALGORITHM, nsa);
       }
     }
   };
@@ -156,7 +156,7 @@ protected Mac initialValue() {
       keyGen = KeyGenerator.getInstance(SELECTED_ALGORITHM);
       keyGen.init(SELECTED_LENGTH);
     } catch (NoSuchAlgorithmException nsa) {
-      throw new IllegalArgumentException("Can't find " + SELECTED_ALGORITHM + " algorithm.");
+      throw new IllegalArgumentException("Can't find " + SELECTED_ALGORITHM, nsa);
     }
   }
 

hadoop-common-project/hadoop-common/src/main/resources/core-default.xml

@@ -1047,29 +1047,25 @@
 </property>
 
 <property>
-  <name>hadoop.security.hmac-algorithm</name>
+  <name>secret-manager.key-generator.algorith</name>
   <value>HmacSHA1</value>
-  <description>The configuration key specifying the hashing algorithm used for
-    HMAC (Hash-based Message Authentication Code) operations.
-
-    The HMAC algorithm is used in token management to compute secure
-    message digests. This configuration allows users to specify the
-    algorithm to be used for HMAC operations. The algorithm must be a
-    valid cryptographic hash algorithm supported by the Java Cryptography
-    Architecture (JCA). Common examples include "HmacSHA1", "HmacSHA256",
-    and "HmacSHA512".</description>
+  <description>
+    The configuration key specifying the KeyGenerator algorithm used in SecretManager
+    for generating secret keys. The algorithm must be a KeyGenerator algorithm supported by
+    the Java Cryptography Architecture (JCA). Common examples include "HmacSHA1",
+    "HmacSHA256", and "HmacSHA512".
+  </description>
 </property>
 
 <property>
-  <name>hadoop.security.hmac-length</name>
+  <name>hadoop.security.secret-manager.key-length</name>
   <value>64</value>
-  <description>The configuration key specifying the key length for HMAC (Hash-based
-    Message Authentication Code) operations.
-
-    This property determines the size of the secret keys generated
-    for HMAC computations. The key length must be appropriate for the
-    selected HMAC algorithm. For example, longer keys are generally
-    more secure but may not be supported by all algorithms.</description>
+  <description>
+    The configuration key specifying the key length of the generated secret keys
+    in SecretManager. The key length must be appropriate for the algorithm.
+    For example, longer keys are generally more secure but may not be supported
+    by all algorithms.
+  </description>
 </property>
 
   <!-- file system properties -->