Repository: commons-crypto
Updated Branches:
  refs/heads/master 24ec02c22 -> 623b4dd66


Tests to check Cipher class re-use

Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/623b4dd6
Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/623b4dd6
Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/623b4dd6

Branch: refs/heads/master
Commit: 623b4dd662959df3761d960f21c334f0de3cd1d3
Parents: 24ec02c
Author: Sebb <[email protected]>
Authored: Tue Jun 28 16:33:26 2016 +0100
Committer: Sebb <[email protected]>
Committed: Tue Jun 28 16:33:26 2016 +0100

----------------------------------------------------------------------
 .../crypto/cipher/AbstractCipherTest.java       | 39 ++++++++++++++++++++
 .../crypto/jna/OpensslJnaCipherTest.java        | 10 +++++
 2 files changed, 49 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/623b4dd6/src/test/java/org/apache/commons/crypto/cipher/AbstractCipherTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/crypto/cipher/AbstractCipherTest.java 
b/src/test/java/org/apache/commons/crypto/cipher/AbstractCipherTest.java
index 2f79335..1cc720a 100644
--- a/src/test/java/org/apache/commons/crypto/cipher/AbstractCipherTest.java
+++ b/src/test/java/org/apache/commons/crypto/cipher/AbstractCipherTest.java
@@ -74,6 +74,45 @@ public abstract class AbstractCipherTest {
     protected abstract void init();
 
     @Test
+    public void closeTestNoInit() throws Exception {
+        CryptoCipher enc = getCipher(transformations[0]);
+        enc.close();
+    }
+
+    @Test
+    public void closeTestAfterInit() throws Exception {
+        CryptoCipher enc = getCipher(transformations[0]);
+        enc.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(KEY, "AES"), new 
IvParameterSpec(IV));
+        enc.close();
+    }
+
+    @Test
+    public void reInitTest() throws Exception {
+        CryptoCipher enc = getCipher(transformations[0]);
+        enc.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(KEY, "AES"), new 
IvParameterSpec(IV));
+        enc.init(Cipher.DECRYPT_MODE, new SecretKeySpec(KEY, "AES"), new 
IvParameterSpec(IV));
+        enc.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(KEY, "AES"), new 
IvParameterSpec(IV));
+        enc.close();
+    }
+
+    @Test
+    public void reInitAfterClose() throws Exception {
+        CryptoCipher enc = getCipher(transformations[0]);
+        enc.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(KEY, "AES"), new 
IvParameterSpec(IV));
+        enc.close();
+        enc.init(Cipher.DECRYPT_MODE, new SecretKeySpec(KEY, "AES"), new 
IvParameterSpec(IV));
+        enc.close();
+    }
+
+    @Test
+    public void closeTestRepeat() throws Exception {
+        CryptoCipher enc = getCipher(transformations[0]);
+        enc.close();
+        enc.close(); // repeat the close
+        enc.close();
+    }
+
+    @Test
     public void cryptoTest() throws GeneralSecurityException {
         for (String tran : transformations) {
             /** uses the small data set in {@link TestData} */

http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/623b4dd6/src/test/java/org/apache/commons/crypto/jna/OpensslJnaCipherTest.java
----------------------------------------------------------------------
diff --git 
a/src/test/java/org/apache/commons/crypto/jna/OpensslJnaCipherTest.java 
b/src/test/java/org/apache/commons/crypto/jna/OpensslJnaCipherTest.java
index 8416484..2d01ffa 100644
--- a/src/test/java/org/apache/commons/crypto/jna/OpensslJnaCipherTest.java
+++ b/src/test/java/org/apache/commons/crypto/jna/OpensslJnaCipherTest.java
@@ -32,4 +32,14 @@ public class OpensslJnaCipherTest extends AbstractCipherTest 
{
                 };
         cipherClass = OpensslJnaCipher.class.getName();
     }
+
+    @Override
+    public void closeTestRepeat() {
+        System.err.println("closeTestRepeat() Causes JVM crash");
+    }
+
+    @Override
+    public void reInitAfterClose() {
+        System.err.println("reInitAfterClose() Causes JVM crash");
+    }
 }

Reply via email to