Fix the bug in PhotonBeetleEngine

Author: gefeili

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

@@ -162,11 +162,20 @@ public int processBytes(byte[] input, int inOff, int len, byte[] output, int out
         int rv = 0;
 
         int originalInOff = inOff;
+        if (!forEncryption && bufferOff >= RATE_INBYTES)
+        {
+            PHOTON_Permutation();
+            rhoohr(output, outOff, buffer, 0, RATE_INBYTES);
+            rv += RATE_INBYTES;
+            System.arraycopy(buffer, RATE_INBYTES, buffer, 0, bufferOff - RATE_INBYTES);
+            bufferOff -= RATE_INBYTES;
+            blockLen -= RATE_INBYTES;
+            outOff += RATE_INBYTES;
+        }
         if (blockLen >= RATE_INBYTES)
         {
             tmp = Math.max(RATE_INBYTES - bufferOff, 0);
             System.arraycopy(input, inOff, buffer, bufferOff, tmp);
-
             PHOTON_Permutation();
             rhoohr(output, outOff, buffer, 0, RATE_INBYTES);
             inOff += tmp;

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

@@ -44,8 +44,8 @@ public void performTest()
         testExceptions(new PhotonBeetleDigest(), 32);
         CipherTest.checkAEADParemeter(this, 16, 16, 16, 16, new PhotonBeetleEngine(PhotonBeetleEngine.PhotonBeetleParameters.pb128));
         CipherTest.checkAEADParemeter(this, 16, 16, 16, 16, new PhotonBeetleEngine(PhotonBeetleEngine.PhotonBeetleParameters.pb32));
-        //CipherTest.checkAEADCipherOutputSize(this, 16, 16, 16, 16, new PhotonBeetleEngine(PhotonBeetleEngine.PhotonBeetleParameters.pb128));
-        //CipherTest.checkAEADCipherOutputSize(this, 16, 16, 4, 16, new PhotonBeetleEngine(PhotonBeetleEngine.PhotonBeetleParameters.pb32));
+        CipherTest.checkAEADCipherOutputSize(this, 16, 16, 16, 16, new PhotonBeetleEngine(PhotonBeetleEngine.PhotonBeetleParameters.pb128));
+        CipherTest.checkAEADCipherOutputSize(this, 16, 16, 4, 16, new PhotonBeetleEngine(PhotonBeetleEngine.PhotonBeetleParameters.pb32));
     }
 
     private void testVectorsHash()