2006-07-16 Raif S. Naffah <raif@swiftdsl.com.au>

	* javax/crypto/Cipher.java (getOutputSize): Allow SPIs initialised for key
	wrapping/unwrapping to invoke their engineGetOutputSize.

2 files changed, 6 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 265975cb4..233f5522b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-07-16  Raif S. Naffah  <raif@swiftdsl.com.au>
 
+	* javax/crypto/Cipher.java (getOutputSize): Allow SPIs initialised for key
+	wrapping/unwrapping to invoke their engineGetOutputSize.
+
+2006-07-16  Raif S. Naffah  <raif@swiftdsl.com.au>
+
 	* gnu/javax/crypto/kwa/TripleDESKeyWrap.java (rnd): New field.
 	(engineInit): If a SecureRandom was specified then use it.
 	(nextRandomBytes): New method.
diff --git a/javax/crypto/Cipher.java b/javax/crypto/Cipher.java
index 1f68ea605..1b56a07f4 100644
--- a/javax/crypto/Cipher.java
+++ b/javax/crypto/Cipher.java
@@ -639,13 +639,7 @@ public class Cipher
   public final int getOutputSize(int inputLength) throws IllegalStateException
   {
     if (cipherSpi == null)
-      {
-        return inputLength;
-      }
-    if (state != ENCRYPT_MODE && state != DECRYPT_MODE)
-      {
-        throw new IllegalStateException("neither encrypting nor decrypting");
-      }
+      return inputLength;
     return cipherSpi.engineGetOutputSize(inputLength);
   }