diff options
author | Raif S. Naffah <raif@swiftdsl.com.au> | 2006-07-16 03:23:49 +0000 |
---|---|---|
committer | Raif S. Naffah <raif@swiftdsl.com.au> | 2006-07-16 03:23:49 +0000 |
commit | d402ef142644f79cf91f3a4902958934cb814d0a (patch) | |
tree | 1a1a34e16769ed455adc12f1bb37ff1558b52145 | |
parent | 2054c40d0b7ce454677d282e2be9944d623c24f8 (diff) | |
download | classpath-d402ef142644f79cf91f3a4902958934cb814d0a.tar.gz |
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.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | javax/crypto/Cipher.java | 8 |
2 files changed, 6 insertions, 7 deletions
@@ -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); } |