From 38607a98aa1c92fe7f6a2a05fd427a10e0c95bfc Mon Sep 17 00:00:00 2001 From: Andrus Adamchik Date: Sun, 13 Apr 2014 13:28:20 +0000 Subject: [PATCH] CAY-1925 cayenne-crypto: add optional compression to the encryption pipeline proper name for header encryptor and decryptor git-svn-id: https://svn.apache.org/repos/asf/cayenne/main/trunk@1586978 13f79535-47bb-0310-9956-ffa450edef68 --- .../crypto/transformer/bytes/CbcBytesTransformerFactory.java | 4 ++-- .../bytes/{DecryptorWithKeyName.java => HeaderDecryptor.java} | 4 ++-- .../bytes/{EncryptorWithKeyName.java => HeaderEncryptor.java} | 4 ++-- ...DecryptorWithKeyNameTest.java => HeaderDecryptorTest.java} | 4 ++-- ...EncryptorWithKeyNameTest.java => HeaderEncryptorTest.java} | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/{DecryptorWithKeyName.java => HeaderDecryptor.java} (93%) rename cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/{EncryptorWithKeyName.java => HeaderEncryptor.java} (92%) rename cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/{DecryptorWithKeyNameTest.java => HeaderDecryptorTest.java} (90%) rename cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/{EncryptorWithKeyNameTest.java => HeaderEncryptorTest.java} (92%) diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java index 26e8a7f8fe..727937ad8b 100644 --- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java +++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java @@ -111,7 +111,7 @@ public BytesEncryptor encryptor() { BytesEncryptor cbcEncryptor = new CbcEncryptor(cipher, key, generateSeedIv()); // TODO: make adding key name for versioning an optional property - return new EncryptorWithKeyName(cbcEncryptor, keyName, blockSize); + return new HeaderEncryptor(cbcEncryptor, keyName, blockSize); } @Override @@ -120,7 +120,7 @@ public BytesDecryptor decryptor() { BytesDecryptor cbcDecryptor = new CbcDecryptor(cipher); // TODO: make checking for key name an optional property - return new DecryptorWithKeyName(cbcDecryptor, keySource, blockSize); + return new HeaderDecryptor(cbcDecryptor, keySource, blockSize); } } diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyName.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java similarity index 93% rename from cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyName.java rename to cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java index 1c418df17e..932aa5e633 100644 --- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyName.java +++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java @@ -27,7 +27,7 @@ /** * @since 3.2 */ -class DecryptorWithKeyName implements BytesDecryptor { +class HeaderDecryptor implements BytesDecryptor { private static final String KEY_NAME_CHARSET = "UTF-8"; @@ -35,7 +35,7 @@ class DecryptorWithKeyName implements BytesDecryptor { private BytesDecryptor delegate; private int blockSize; - public DecryptorWithKeyName(BytesDecryptor delegate, KeySource keySource, int blockSize) { + public HeaderDecryptor(BytesDecryptor delegate, KeySource keySource, int blockSize) { this.delegate = delegate; this.blockSize = blockSize; this.keySource = keySource; diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyName.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptor.java similarity index 92% rename from cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyName.java rename to cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptor.java index e0560ee0a2..43c34589c6 100644 --- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyName.java +++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptor.java @@ -20,13 +20,13 @@ import org.apache.cayenne.crypto.CayenneCryptoException; -class EncryptorWithKeyName implements BytesEncryptor { +class HeaderEncryptor implements BytesEncryptor { private BytesEncryptor delegate; private int blockSize; private byte[] keyName; - EncryptorWithKeyName(BytesEncryptor delegate, byte[] keyName, int blockSize) { + HeaderEncryptor(BytesEncryptor delegate, byte[] keyName, int blockSize) { this.delegate = delegate; this.blockSize = blockSize; this.keyName = keyName; diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyNameTest.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptorTest.java similarity index 90% rename from cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyNameTest.java rename to cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptorTest.java index b562a29602..1ef426a0a4 100644 --- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyNameTest.java +++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptorTest.java @@ -24,7 +24,7 @@ import org.apache.cayenne.crypto.key.KeySource; import org.junit.Test; -public class DecryptorWithKeyNameTest { +public class HeaderDecryptorTest { @Test public void testKeyName() { @@ -33,7 +33,7 @@ public void testKeyName() { byte[] input2 = { 'a', 'b', 'c', 0, 'e' }; byte[] input3 = { 'a', 'b', 0, 0, 'e' }; - DecryptorWithKeyName decryptor = new DecryptorWithKeyName(mock(BytesDecryptor.class), mock(KeySource.class), 3); + HeaderDecryptor decryptor = new HeaderDecryptor(mock(BytesDecryptor.class), mock(KeySource.class), 3); assertEquals("bcd", decryptor.keyName(input1, 1)); assertEquals("bc", decryptor.keyName(input2, 1)); assertEquals("b", decryptor.keyName(input3, 1)); diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyNameTest.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptorTest.java similarity index 92% rename from cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyNameTest.java rename to cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptorTest.java index 8e314ace5a..32ff99196c 100644 --- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyNameTest.java +++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptorTest.java @@ -25,7 +25,7 @@ import org.apache.cayenne.crypto.unit.SwapBytesTransformer; import org.junit.Test; -public class EncryptorWithKeyNameTest { +public class HeaderEncryptorTest { @Test public void testTransform() throws UnsupportedEncodingException { @@ -37,7 +37,7 @@ public void testTransform() throws UnsupportedEncodingException { byte[] input = { 1, 2, 3, 4, 5, 6, 7, 8 }; // intentionally non-standard block size.. - EncryptorWithKeyName encryptor = new EncryptorWithKeyName(delegate, keyName, 5); + HeaderEncryptor encryptor = new HeaderEncryptor(delegate, keyName, 5); byte[] output = encryptor.encrypt(input, 1); assertArrayEquals(new byte[] { 0, 'm', 'y', 'k', 'e', 'y', 8, 7, 6, 5, 4, 3, 2, 1 }, output);