svn commit: r1586978 - in /cayenne/main/trunk/cayenne-crypto/src: main/java/org/apache/cayenne/crypto/transformer/bytes/ test/java/org/apache/cayenne/crypto/transformer/bytes/

[aa...@apache.org]

Author: aadamchik
Date: Sun Apr 13 13:28:20 2014
New Revision: 1586978

URL: http://svn.apache.org/r1586978
Log:
CAY-1925 cayenne-crypto: add optional compression to the encryption pipeline

proper name for header encryptor and decryptor

Added:
    cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java
      - copied, changed from r1586977, cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyName.java
    cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptor.java
      - copied, changed from r1586977, cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyName.java
    cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptorTest.java
      - copied, changed from r1586977, cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyNameTest.java
    cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptorTest.java
      - copied, changed from r1586977, cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyNameTest.java
Removed:
    cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyName.java
    cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyName.java
    cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyNameTest.java
    cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyNameTest.java
Modified:
    cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java

Modified: cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java?rev=1586978&r1=1586977&r2=1586978&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java (original)
+++ cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java Sun Apr 13 13:28:20 2014
@@ -111,7 +111,7 @@ class CbcBytesTransformerFactory impleme
         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 @@ class CbcBytesTransformerFactory impleme
         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);
     }
 
 }

Copied: cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java (from r1586977, cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyName.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java?p2=cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java&p1=cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyName.java&r1=1586977&r2=1586978&rev=1586978&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyName.java (original)
+++ cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java Sun Apr 13 13:28:20 2014
@@ -27,7 +27,7 @@ import org.apache.cayenne.crypto.key.Key
 /**
  * @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 By
     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;

Copied: cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptor.java (from r1586977, cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyName.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptor.java?p2=cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptor.java&p1=cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyName.java&r1=1586977&r2=1586978&rev=1586978&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyName.java (original)
+++ cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptor.java Sun Apr 13 13:28:20 2014
@@ -20,13 +20,13 @@ package org.apache.cayenne.crypto.transf
 
 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;

Copied: cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptorTest.java (from r1586977, cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyNameTest.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptorTest.java?p2=cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptorTest.java&p1=cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyNameTest.java&r1=1586977&r2=1586978&rev=1586978&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyNameTest.java (original)
+++ cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptorTest.java Sun Apr 13 13:28:20 2014
@@ -24,7 +24,7 @@ import static org.mockito.Mockito.mock;
 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 class DecryptorWithKeyNameTest {
         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));

Copied: cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptorTest.java (from r1586977, cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyNameTest.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptorTest.java?p2=cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptorTest.java&p1=cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyNameTest.java&r1=1586977&r2=1586978&rev=1586978&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyNameTest.java (original)
+++ cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptorTest.java Sun Apr 13 13:28:20 2014
@@ -25,7 +25,7 @@ import java.io.UnsupportedEncodingExcept
 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 class EncryptorWithKeyNameTest {
         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);