Merge branch 'tonywasher-patches/xof/Kangaroo' into master

Author: mwcw

core/src/main/java/org/bouncycastle/crypto/digests/Kangaroo.java

@@ -88,11 +88,6 @@ public static class KangarooParameters
          */
         private byte[] thePersonal;
 
-        /**
-         * The maximum xofLen.
-         */
-        private long theMaxXofLen;
-
         /**
          * Obtain the personalisation.
          *
@@ -103,16 +98,6 @@ public byte[] getPersonalisation()
             return Arrays.clone(thePersonal);
         }
 
-        /**
-         * Obtain the maximum output length.
-         *
-         * @return the output length
-         */
-        public long getMaxOutputLength()
-        {
-            return theMaxXofLen;
-        }
-
         /**
          * Parameter Builder.
          */
@@ -123,11 +108,6 @@ public static class Builder
              */
             private byte[] thePersonal;
 
-            /**
-             * The maximum xofLen.
-             */
-            private long theMaxXofLen;
-
             /**
              * Set the personalisation.
              *
@@ -140,18 +120,6 @@ public Builder setPersonalisation(final byte[] pPersonal)
                 return this;
             }
 
-            /**
-             * Set the maximum output length. (-1=unlimited)
-             *
-             * @param pMaxOutLen the maximum output length
-             * @return the Builder
-             */
-            public Builder setMaxOutputLen(final long pMaxOutLen)
-            {
-                theMaxXofLen = pMaxOutLen;
-                return this;
-            }
-
             /**
              * Build the parameters.
              *
@@ -162,12 +130,11 @@ public KangarooParameters build()
                 /* Create params */
                 final KangarooParameters myParams = new KangarooParameters();
 
-                /* Record personalisation and xof length */
+                /* Record personalisation */
                 if (thePersonal != null)
                 {
                     myParams.thePersonal = thePersonal;
                 }
-                myParams.theMaxXofLen = theMaxXofLen;
 
                 /* Return the parameters */
                 return myParams;
@@ -231,16 +198,6 @@ abstract static class KangarooBase
          */
         private byte[] thePersonal;
 
-        /**
-         * The XofLen.
-         */
-        private long theXofLen;
-
-        /**
-         * The XofRemaining.
-         */
-        private long theXofRemaining;
-
         /**
          * Are we squeezing?.
          */
@@ -271,8 +228,6 @@ abstract static class KangarooBase
             theTree = new KangarooSponge(pStrength, pRounds);
             theLeaf = new KangarooSponge(pStrength, pRounds);
             theChainLen = pStrength >> 2;
-            theXofLen = pLength;
-            theXofRemaining = -1L;
 
             /* Build personalisation */
             buildPersonal(null);
@@ -301,7 +256,7 @@ public int getByteLength()
 
         public int getDigestSize()
         {
-            return theXofLen == 0 ? theChainLen >> 1 : (int)theXofLen;
+            return theChainLen >> 1;
         }
 
         /**
@@ -314,14 +269,6 @@ public void init(final KangarooParameters pParams)
             /* Build the new personalisation */
             buildPersonal(pParams.getPersonalisation());
 
-            /* Reject a negative Xof length */
-            final long myXofLen = pParams.getMaxOutputLength();
-            if (myXofLen < -1)
-            {
-                throw new IllegalArgumentException("Invalid output length");
-            }
-            theXofLen = myXofLen;
-
             /* Reset everything */
             reset();
         }
@@ -342,12 +289,6 @@ public void update(final byte[] pIn,
         public int doFinal(final byte[] pOut,
                            final int pOutOffset)
         {
-            /* Check for defined output length */
-            if (getDigestSize() == -1)
-            {
-                throw new IllegalStateException("No defined output length");
-            }
-
             /* finalise the digest */
             return doFinal(pOut, pOutOffset, getDigestSize());
         }
@@ -380,11 +321,10 @@ public int doOutput(final byte[] pOut,
                 switchToSqueezing();
             }
 
-            /* Reject if there is insufficient Xof remaining */
-            if (pOutLen < 0
-                || (theXofRemaining > 0 && pOutLen > theXofRemaining))
+            /* Reject if length is invalid */
+            if (pOutLen < 0)
             {
-                throw new IllegalArgumentException("Insufficient bytes remaining");
+                throw new IllegalArgumentException("Invalid output length");
             }
 
             /* Squeeze out the data and return the length */
@@ -455,7 +395,6 @@ public void reset()
             theLeaf.initSponge();
             theCurrNode = 0;
             theProcessed = 0;
-            theXofRemaining = -1L;
             squeezing = false;
         }
 
@@ -513,22 +452,6 @@ private void switchToSqueezing()
             {
                 switchFinal();
             }
-
-            /* If we have a null Xof */
-            if (theXofLen == 0)
-            {
-                /* Calculate the number of bytes available */
-                theXofRemaining = getDigestSize();
-
-                /* Else we are handling a normal Xof */
-            }
-            else
-            {
-                /* Calculate the number of bytes available */
-                theXofRemaining = theXofLen == -1
-                    ? -2
-                    : theXofLen;
-            }
         }
 
         /**

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

@@ -95,18 +95,18 @@ void testKangaroo(final int pMsgLen,
         final KangarooTwelve myDigest = new KangarooTwelve();
         final KangarooParameters myParams = new KangarooParameters.Builder()
                 .setPersonalisation(myPers)
-                .setMaxOutputLen(myXofLen)
                 .build();
         myDigest.init(myParams);
         myDigest.update(myMsg, 0, pMsgLen);
-        myDigest.doFinal(myOutput, 0);
+        myDigest.doFinal(myOutput, 0, myOutput.length);
 
         /* If we are only looking at the last bit of the output */
         if (pOutLen != 0)
         {
             myOutput = Arrays.copyOfRange(myOutput, pOutLen - myExpected.length, pOutLen);
         }
 
+
         /* Check the result */
         isTrue("Result mismatch", Arrays.areEqual(myExpected, myOutput));
     }