RFC3394WrapEngine: check input length in unwrap

Author: peterdettman

core/src/main/java/org/bouncycastle/crypto/engines/RFC3394WrapEngine.java

@@ -143,6 +143,10 @@ public byte[] unwrap(
         {
             throw new IllegalStateException("not set for unwrapping");
         }
+        if (inLen < iv.length)
+        {
+            throw new InvalidCipherTextException("unwrap data too short");
+        }
 
         int     n = inLen / 8;
 

core/src/test/java/org/bouncycastle/crypto/test/AESWrapTest.java

@@ -216,15 +216,27 @@ public void performTest()
         }
 
         //
-        // short test
+        // short tests
         //
         try
         {
             wrapper.init(false, key);
 
+            wrapper.unwrap(buf, 0, 0);
+
+            fail("failed unwrap short test 1.");
+        }
+        catch (InvalidCipherTextException e)
+        {
+            // expected
+        }
+        try
+        {
+            wrapper.init(false, key);
+
             wrapper.unwrap(buf, 0, buf.length / 2);
 
-            fail("failed unwrap short test.");
+            fail("failed unwrap short test 2.");
         }
         catch (InvalidCipherTextException e)
         {
@@ -237,7 +249,7 @@ public void performTest()
 
             wrapper.wrap(buf, 0, 15);
 
-            fail("ailed wrap length test.");
+            fail("failed wrap length test.");
         }
         catch (DataLengthException e)
         {