From db3e019bf23483ae9ab094f887fb4d5919405362 Mon Sep 17 00:00:00 2001
From: quannguyentm <quannguyen@google.com>
Date: Wed, 7 Jun 2017 17:12:10 -0700
Subject: [PATCH] Move init into the loop. (#32)

The current code fails to initialize the cipher c after a c.doFinal()
fails. According to JCE documentation, a cipher is in an undefined state
after throwing an exception.
---
 .../wycheproof/testcases/RsaEncryptionTest.java     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/java/com/google/security/wycheproof/testcases/RsaEncryptionTest.java b/java/com/google/security/wycheproof/testcases/RsaEncryptionTest.java
index a15d45d..7e3f515 100644
--- a/java/com/google/security/wycheproof/testcases/RsaEncryptionTest.java
+++ b/java/com/google/security/wycheproof/testcases/RsaEncryptionTest.java
@@ -116,12 +116,12 @@ public class RsaEncryptionTest extends TestCase {
       }
     }
     Cipher enc = Cipher.getInstance("RSA/ECB/NOPADDING");
-    enc.init(Cipher.ENCRYPT_MODE, keypair.getPublic());
-    c.init(Cipher.DECRYPT_MODE, keypair.getPrivate());
     byte[][] paddedKeys = generatePkcs1Vectors(1024 / 8);
     for (int i = 0; i < paddedKeys.length; i++) {
+      enc.init(Cipher.ENCRYPT_MODE, keypair.getPublic());
       ciphertext = enc.doFinal(paddedKeys[i]);
       try {
+        c.init(Cipher.DECRYPT_MODE, keypair.getPrivate());
         c.doFinal(ciphertext);
       } catch (Exception ex) {
         exceptions.add(ex.toString());
@@ -148,12 +148,11 @@ public class RsaEncryptionTest extends TestCase {
   public void testGetExceptionsOAEP() throws Exception {
     testExceptions("RSA/ECB/OAEPWITHSHA-1ANDMGF1PADDING");
   }
-  
+
   /**
    * Generates PKCS#1 invalid vectors
    * @param rsaKeyLength
-   * @return 
-  */
+   */
   private byte[][] generatePkcs1Vectors(int rsaKeyLength) {
     // create plain padded keys
     byte[][] plainPaddedKeys = new byte[13][];
@@ -190,9 +189,9 @@ public class RsaEncryptionTest extends TestCase {
     // set the second byte to 0x02
     key[1] = 0x02;
     // set the separating byte
-    if(symmetricKeyLength != -1) {
+    if (symmetricKeyLength != -1) {
       key[rsaKeyLength - symmetricKeyLength - 1] = 0x00;
-    }    
+    }
     return key;
   }