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

HADOOP-10841. EncryptedKeyVersion should have a key name property. (asuresh via tucu) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619534 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alejandro Abdelnur 2014-08-21 18:59:24 +00:00
parent db646f04f3
commit 0197f57ff4
3 changed files with 14 additions and 3 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

@ -145,6 +145,9 @@ Release 2.6.0 - UNRELEASED
HADOOP-10824. Refactor KMSACLs to avoid locking. (Benoy Antony via umamahesh) HADOOP-10824. Refactor KMSACLs to avoid locking. (Benoy Antony via umamahesh)
HADOOP-10841. EncryptedKeyVersion should have a key name property.
(asuresh via tucu)
BUG FIXES BUG FIXES
HADOOP-10781. Unportable getgrouplist() usage breaks FreeBSD (Dmitry HADOOP-10781. Unportable getgrouplist() usage breaks FreeBSD (Dmitry

13
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderCryptoExtension.java
View File

@ -44,17 +44,23 @@ public class KeyProviderCryptoExtension extends
* used to generate the encrypted Key and the encrypted KeyVersion * used to generate the encrypted Key and the encrypted KeyVersion
*/ */
public static class EncryptedKeyVersion { public static class EncryptedKeyVersion {
private String keyName;
private String keyVersionName; private String keyVersionName;
private byte[] iv; private byte[] iv;
private KeyVersion encryptedKey; private KeyVersion encryptedKey;
protected EncryptedKeyVersion(String keyVersionName, byte[] iv, protected EncryptedKeyVersion(String keyName, String keyVersionName,
KeyVersion encryptedKey) { byte[] iv, KeyVersion encryptedKey) {
this.keyName = keyName;
this.keyVersionName = keyVersionName; this.keyVersionName = keyVersionName;
this.iv = iv; this.iv = iv;
this.encryptedKey = encryptedKey; this.encryptedKey = encryptedKey;
} }
public String getKeyName() {
return keyName;
}
public String getKeyVersionName() { public String getKeyVersionName() {
return keyVersionName; return keyVersionName;
} }
@ -153,7 +159,8 @@ public class KeyProviderCryptoExtension extends
cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(keyVer.getMaterial(), cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(keyVer.getMaterial(),
"AES"), new IvParameterSpec(flipIV(iv))); "AES"), new IvParameterSpec(flipIV(iv)));
byte[] ek = cipher.doFinal(newKey); byte[] ek = cipher.doFinal(newKey);
return new EncryptedKeyVersion(keyVersion.getVersionName(), iv, return new EncryptedKeyVersion(keyVersion.getName(),
keyVersion.getVersionName(), iv,
new KeyVersion(keyVer.getName(), EEK, ek)); new KeyVersion(keyVer.getName(), EEK, ek));
} }

1
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/TestKeyProviderCryptoExtension.java
View File

@ -45,6 +45,7 @@ public class TestKeyProviderCryptoExtension {
kpExt.generateEncryptedKey(kv); kpExt.generateEncryptedKey(kv);
Assert.assertEquals(KeyProviderCryptoExtension.EEK, Assert.assertEquals(KeyProviderCryptoExtension.EEK,
ek1.getEncryptedKey().getVersionName()); ek1.getEncryptedKey().getVersionName());
Assert.assertEquals("foo", ek1.getKeyName());
Assert.assertNotNull(ek1.getEncryptedKey().getMaterial()); Assert.assertNotNull(ek1.getEncryptedKey().getMaterial());
Assert.assertEquals(kv.getMaterial().length, Assert.assertEquals(kv.getMaterial().length,
ek1.getEncryptedKey().getMaterial().length); ek1.getEncryptedKey().getMaterial().length);