Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10939. Fix TestKeyProviderFactory testcases to use default 128 bit length keys. Contributed by Arun Suresh. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616021 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew Wang 2014-08-05 22:06:48 +00:00
parent 857d134fda
commit 34e3bbae9f
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -418,6 +418,9 @@ Trunk (Unreleased)
HADOOP-10925. Compilation fails in native link0 function on Windows. HADOOP-10925. Compilation fails in native link0 function on Windows.
(cnauroth) (cnauroth)
HADOOP-10939. Fix TestKeyProviderFactory testcases to use default 128 bit
length keys. (Arun Suresh via wang)
OPTIMIZATIONS OPTIMIZATIONS
HADOOP-7761. Improve the performance of raw comparisons. (todd) HADOOP-7761. Improve the performance of raw comparisons. (todd)

14
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestKeyProviderFactory.java
View File

@ -100,9 +100,9 @@ public class TestKeyProviderFactory {
static void checkSpecificProvider(Configuration conf, static void checkSpecificProvider(Configuration conf,
String ourUrl) throws Exception { String ourUrl) throws Exception {
KeyProvider provider = KeyProviderFactory.getProviders(conf).get(0); KeyProvider provider = KeyProviderFactory.getProviders(conf).get(0);
byte[] key1 = new byte[32]; byte[] key1 = new byte[16];
byte[] key2 = new byte[32]; byte[] key2 = new byte[16];
byte[] key3 = new byte[32]; byte[] key3 = new byte[16];
for(int i =0; i < key1.length; ++i) { for(int i =0; i < key1.length; ++i) {
key1[i] = (byte) i; key1[i] = (byte) i;
key2[i] = (byte) (i * 2); key2[i] = (byte) (i * 2);
@ -146,7 +146,7 @@ public class TestKeyProviderFactory {
KeyProvider.options(conf).setBitLength(8)); KeyProvider.options(conf).setBitLength(8));
assertTrue("should throw", false); assertTrue("should throw", false);
} catch (IOException e) { } catch (IOException e) {
assertEquals("Wrong key length. Required 8, but got 256", e.getMessage()); assertEquals("Wrong key length. Required 8, but got 128", e.getMessage());
} }
provider.createKey("key4", new byte[]{1}, provider.createKey("key4", new byte[]{1},
KeyProvider.options(conf).setBitLength(8)); KeyProvider.options(conf).setBitLength(8));
@ -162,7 +162,7 @@ public class TestKeyProviderFactory {
provider.rollNewVersion("key4", key1); provider.rollNewVersion("key4", key1);
assertTrue("should throw", false); assertTrue("should throw", false);
} catch (IOException e) { } catch (IOException e) {
assertEquals("Wrong key length. Required 8, but got 256", e.getMessage()); assertEquals("Wrong key length. Required 8, but got 128", e.getMessage());
} }
try { try {
provider.rollNewVersion("no-such-key", key1); provider.rollNewVersion("no-such-key", key1);
@ -228,7 +228,7 @@ public class TestKeyProviderFactory {
public void checkPermissionRetention(Configuration conf, String ourUrl, Path path) throws Exception { public void checkPermissionRetention(Configuration conf, String ourUrl, Path path) throws Exception {
KeyProvider provider = KeyProviderFactory.getProviders(conf).get(0); KeyProvider provider = KeyProviderFactory.getProviders(conf).get(0);
// let's add a new key and flush and check that permissions are still set to 777 // let's add a new key and flush and check that permissions are still set to 777
byte[] key = new byte[32]; byte[] key = new byte[16];
for(int i =0; i < key.length; ++i) { for(int i =0; i < key.length; ++i) {
key[i] = (byte) i; key[i] = (byte) i;
} }
@ -261,7 +261,7 @@ public class TestKeyProviderFactory {
conf.set(JavaKeyStoreProvider.KEYSTORE_PASSWORD_FILE_KEY, conf.set(JavaKeyStoreProvider.KEYSTORE_PASSWORD_FILE_KEY,
"javakeystoreprovider.password"); "javakeystoreprovider.password");
KeyProvider provider = KeyProviderFactory.getProviders(conf).get(0); KeyProvider provider = KeyProviderFactory.getProviders(conf).get(0);
provider.createKey("key3", new byte[32], KeyProvider.options(conf)); provider.createKey("key3", new byte[16], KeyProvider.options(conf));
provider.flush(); provider.flush();
} catch (Exception ex) { } catch (Exception ex) {
Assert.fail("could not create keystore with password file"); Assert.fail("could not create keystore with password file");