HDFS-7181. Remove incorrect precondition check on key length in FileEncryptionInfo. (wang)

(cherry picked from commit 6ac10516e7fa28384b6d3c2670f6621e2666ffdb)
(cherry picked from commit 6dbba19469d698891e9c6a8513cbe58992a736b1)

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CipherSuite.java

@@ -73,16 +73,6 @@ public enum CipherSuite {
     return builder.toString();
   }
   
-  public static void checkName(String name) {
-    CipherSuite[] suites = CipherSuite.values();
-    for (CipherSuite suite : suites) {
-      if (suite.getName().equals(name)) {
-        return;
-      }
-    }
-    throw new IllegalArgumentException("Invalid cipher suite name: " + name);
-  }
-  
   /**
    * Convert to CipherSuite from name, {@link #algoBlockSize} is fixed for
    * certain cipher suite, just need to compare the name.

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

@@ -58,8 +58,6 @@ public class FileEncryptionInfo {
     checkNotNull(iv);
     checkNotNull(keyName);
     checkNotNull(ezKeyVersionName);
-    checkArgument(edek.length == suite.getAlgorithmBlockSize(),
-        "Unexpected key length");
     checkArgument(iv.length == suite.getAlgorithmBlockSize(),
         "Unexpected IV length");
     this.cipherSuite = suite;

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -530,6 +530,9 @@ Release 2.6.0 - UNRELEASED
     HDFS-7179. DFSClient should instantiate a KeyProvider, not a
     KeyProviderCryptoExtension. (wang)
 
+    HDFS-7181. Remove incorrect precondition check on key length in
+    FileEncryptionInfo. (wang)
+
     BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
   
       HDFS-6387. HDFS CLI admin tool for creating & deleting an