* gnu/javax/crypto/jce/cipher/CipherAdapter.java

	(engineInit): Throw InvalidAlgorithmParameterException
	for invalid IVParameterSpec IV length.

2 files changed, 12 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index cf66b6342..623accb33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-14  Matt Wringe  <mwringe@redhat.com>
+
+	* gnu/javax/crypto/jce/cipher/CipherAdapter.java 
+	(engineInit): Throw InvalidAlgorithmParameterException
+	for invalid IVParameterSpec IV length.
+
 2006-07-14  David Gilbert  <david.gilbert@object-refinery.com>
 
 	* java/awt/image/MultiPixelPackedSampleModel.java
diff --git a/gnu/javax/crypto/jce/cipher/CipherAdapter.java b/gnu/javax/crypto/jce/cipher/CipherAdapter.java
index 9dbc40df7..b7cd755f5 100644
--- a/gnu/javax/crypto/jce/cipher/CipherAdapter.java
+++ b/gnu/javax/crypto/jce/cipher/CipherAdapter.java
@@ -343,6 +343,12 @@ class CipherAdapter
       }
     else if (params instanceof IvParameterSpec)
       {
+        // The size of the IV must match the block size
+        if (((IvParameterSpec) params).getIV().length != cipher.defaultBlockSize())
+          {
+            throw new InvalidAlgorithmParameterException();
+          }
+        
         attributes.put(IMode.IV, ((IvParameterSpec) params).getIV());
         blockLen = cipher.defaultBlockSize();
         attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE, Integer.valueOf(blockLen));