Merge remote-tracking branch 'tonywasher/nistAEADoutputLength' into 1924-lightweight-aead-output-size

Author: gefeili

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

@@ -404,6 +404,7 @@ public int doFinal(byte[] output, int outOff)
             throw new OutputLengthException("output buffer is too short");
         }
         int mlen = len + messageLen - (forEncryption ? 0 : CRYPTO_ABYTES);
+        int rv = mlen - messageLen;
         int adlen = processAADBytes();
         int nblocks_c = 1 + mlen / BLOCK_SIZE;
         int nblocks_m = (mlen % BLOCK_SIZE) != 0 ? nblocks_c : nblocks_c - 1;
@@ -418,7 +419,7 @@ public int doFinal(byte[] output, int outOff)
         {
             System.arraycopy(tag_buffer, 0, tag, 0, CRYPTO_ABYTES);
             System.arraycopy(tag, 0, output, outOff, tag.length);
-            mlen += CRYPTO_ABYTES;
+            rv += CRYPTO_ABYTES;
         }
         else
         {
@@ -432,7 +433,7 @@ public int doFinal(byte[] output, int outOff)
             }
         }
         reset(false);
-        return mlen;
+        return rv;
     }
 
     @Override
@@ -455,6 +456,8 @@ public int getUpdateOutputSize(int len)
         case EncData:
         case EncInit:
             return inputOff + len + CRYPTO_ABYTES;
+        case DecData:
+            return inputOff + len;
         }
         return Math.max(0, len + inputOff - CRYPTO_ABYTES);
     }
@@ -472,9 +475,9 @@ public int getOutputSize(int len)
         case EncAad:
         case EncData:
         case EncInit:
-            return len + CRYPTO_ABYTES;
+            return len + inputOff + CRYPTO_ABYTES;
         }
-        return Math.max(0, len - CRYPTO_ABYTES);
+        return Math.max(0, len + inputOff - CRYPTO_ABYTES);
     }
 
     @Override

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

@@ -806,7 +806,7 @@ public void init(boolean forEncryption, CipherParameters params)
         if (iv == null || iv.length != 16)
         {
             throw new IllegalArgumentException(
-                "ISAP AEAD requires exactly 12 bytes of IV");
+                "ISAP AEAD requires exactly 16 bytes of IV");
         }
 
         if (!(ivParams.getParameters() instanceof KeyParameter))
@@ -961,13 +961,13 @@ public byte[] getMac()
     @Override
     public int getUpdateOutputSize(int len)
     {
-        return len;
+        return len + message.size();
     }
 
     @Override
     public int getOutputSize(int len)
     {
-        return len + 16;
+        return Math.max(0, len + message.size() + (forEncryption ? 16 : -16));
     }
 
     @Override

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

@@ -270,13 +270,13 @@ public byte[] getMac()
     @Override
     public int getUpdateOutputSize(int len)
     {
-        return len;
+        return len + message.size();
     }
 
     @Override
     public int getOutputSize(int len)
     {
-        return len + TAG_INBYTES;
+        return Math.max(0, len + message.size() + (forEncryption ? TAG_INBYTES : -TAG_INBYTES));
     }
 
     @Override

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

@@ -262,13 +262,13 @@ public byte[] getMac()
     @Override
     public int getUpdateOutputSize(int len)
     {
-        return len;
+        return len + message.size();
     }
 
     @Override
     public int getOutputSize(int len)
     {
-        return len + TAGLEN;
+        return Math.max(0, len + message.size() + (forEncryption ? TAGLEN : -TAGLEN));
     }
 
     @Override