Repository: hadoop
Updated Branches:
  refs/heads/branch-3.1 c1fc87dcc -> 1176a128d


HADOOP-15312. Undocumented KeyProvider configuration keys. Contributed by LiXin 
Ge.

(cherry picked from commit 3fe41c65d84843f817a4f9ef8999dbf862db6674)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1176a128
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1176a128
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1176a128

Branch: refs/heads/branch-3.1
Commit: 1176a128d632925749db0a81a719fd8141c3cbb6
Parents: c1fc87d
Author: Wei-Chiu Chuang <[email protected]>
Authored: Tue Mar 27 13:33:41 2018 -0700
Committer: Wei-Chiu Chuang <[email protected]>
Committed: Tue Mar 27 13:36:00 2018 -0700

----------------------------------------------------------------------
 .../src/main/resources/core-default.xml          | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1176a128/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
----------------------------------------------------------------------
diff --git 
a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml 
b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
index 9074300..49bfa28 100644
--- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
+++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
@@ -2495,6 +2495,25 @@
 </property>
 
 <property>
+  <name>hadoop.security.key.default.bitlength</name>
+  <value>128</value>
+  <description>
+    The length (bits) of keys we want the KeyProvider to produce. Key length
+    defines the upper-bound on an algorithm's security, ideally, it would
+    coincide with the lower-bound on an algorithm's security.
+  </description>
+</property>
+
+<property>
+  <name>hadoop.security.key.default.cipher</name>
+  <value>AES/CTR/NoPadding</value>
+  <description>
+    This indicates the algorithm that be used by KeyProvider for generating
+    key, and will be converted to CipherSuite when creating encryption zone.
+  </description>
+</property>
+
+<property>
   <name>fs.har.impl.disable.cache</name>
   <value>true</value>
   <description>Don't cache 'har' filesystem instances.</description>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to