Add/fix High/Low methods of Pack

peterdettman · peterdettman · commit 55465014a20a · 2025-12-03T00:41:08.000+07:00
diff --git a/core/src/main/java/org/bouncycastle/crypto/digests/AsconCXof128.java b/core/src/main/java/org/bouncycastle/crypto/digests/AsconCXof128.java
@@ -58,7 +58,7 @@ protected long loadBytes(final byte[] bytes, int inOff)
 
     protected long loadBytes(final byte[] bytes, int inOff, int n)
     {
-        return Pack.littleEndianToLong(bytes, inOff, n);
+        return n <= 0 ? 0L : Pack.littleEndianToLong_Low(bytes, inOff, n);
     }
 
     protected void setBytes(long w, byte[] bytes, int inOff)
@@ -68,7 +68,10 @@ protected void setBytes(long w, byte[] bytes, int inOff)
 
     protected void setBytes(long w, byte[] bytes, int inOff, int n)
     {
-        Pack.longToLittleEndian(w, bytes, inOff, n);
+        if (n > 0)
+        {
+            Pack.longToLittleEndian_Low(w, bytes, inOff, n);
+        }
     }
 
     @Override
diff --git a/core/src/main/java/org/bouncycastle/crypto/digests/AsconDigest.java b/core/src/main/java/org/bouncycastle/crypto/digests/AsconDigest.java
@@ -53,7 +53,7 @@ protected long loadBytes(final byte[] bytes, int inOff)
 
     protected long loadBytes(final byte[] bytes, int inOff, int n)
     {
-        return Pack.bigEndianToLong(bytes, inOff, n);
+        return n <= 0 ? 0L : Pack.bigEndianToLong_High(bytes, inOff, n);
     }
 
     protected void setBytes(long w, byte[] bytes, int inOff)
@@ -63,7 +63,10 @@ protected void setBytes(long w, byte[] bytes, int inOff)
 
     protected void setBytes(long w, byte[] bytes, int inOff, int n)
     {
-        Pack.longToBigEndian(w, bytes, inOff, n);
+        if (n > 0)
+        {
+            Pack.longToBigEndian_High(w, bytes, inOff, n);
+        }
     }
 
     @Override
diff --git a/core/src/main/java/org/bouncycastle/crypto/digests/AsconHash256.java b/core/src/main/java/org/bouncycastle/crypto/digests/AsconHash256.java
@@ -34,7 +34,7 @@ protected long loadBytes(final byte[] bytes, int inOff)
 
     protected long loadBytes(final byte[] bytes, int inOff, int n)
     {
-        return Pack.littleEndianToLong(bytes, inOff, n);
+        return n <= 0 ? 0L : Pack.littleEndianToLong_Low(bytes, inOff, n);
     }
 
     protected void setBytes(long w, byte[] bytes, int inOff)
@@ -44,7 +44,10 @@ protected void setBytes(long w, byte[] bytes, int inOff)
 
     protected void setBytes(long w, byte[] bytes, int inOff, int n)
     {
-        Pack.longToLittleEndian(w, bytes, inOff, n);
+        if (n > 0)
+        {
+            Pack.longToLittleEndian_Low(w, bytes, inOff, n);
+        }
     }
 
     @Override
diff --git a/core/src/main/java/org/bouncycastle/crypto/digests/AsconXof.java b/core/src/main/java/org/bouncycastle/crypto/digests/AsconXof.java
@@ -54,7 +54,7 @@ protected long loadBytes(final byte[] bytes, int inOff)
 
     protected long loadBytes(final byte[] bytes, int inOff, int n)
     {
-        return Pack.bigEndianToLong(bytes, inOff, n);
+        return n <= 0 ? 0L : Pack.bigEndianToLong_High(bytes, inOff, n);
     }
 
     protected void setBytes(long w, byte[] bytes, int inOff)
@@ -64,7 +64,10 @@ protected void setBytes(long w, byte[] bytes, int inOff)
 
     protected void setBytes(long w, byte[] bytes, int inOff, int n)
     {
-        Pack.longToBigEndian(w, bytes, inOff, n);
+        if (n > 0)
+        {
+            Pack.longToBigEndian_High(w, bytes, inOff, n);
+        }
     }
 
     @Override
diff --git a/core/src/main/java/org/bouncycastle/crypto/digests/AsconXof128.java b/core/src/main/java/org/bouncycastle/crypto/digests/AsconXof128.java
@@ -35,7 +35,7 @@ protected long loadBytes(final byte[] bytes, int inOff)
 
     protected long loadBytes(final byte[] bytes, int inOff, int n)
     {
-        return Pack.littleEndianToLong(bytes, inOff, n);
+        return n <= 0 ? 0L : Pack.littleEndianToLong_Low(bytes, inOff, n);
     }
 
     protected void setBytes(long w, byte[] bytes, int inOff)
@@ -45,7 +45,10 @@ protected void setBytes(long w, byte[] bytes, int inOff)
 
     protected void setBytes(long w, byte[] bytes, int inOff, int n)
     {
-        Pack.longToLittleEndian(w, bytes, inOff, n);
+        if (n > 0)
+        {
+            Pack.longToLittleEndian_Low(w, bytes, inOff, n);
+        }
     }
 
     @Override
diff --git a/core/src/main/java/org/bouncycastle/crypto/digests/Blake2bDigest.java b/core/src/main/java/org/bouncycastle/crypto/digests/Blake2bDigest.java
@@ -482,7 +482,7 @@ public int doFinal(byte[] out, int outOffset)
         Pack.longToLittleEndian(chainValue, 0, full, out, outOffset);
         if (partial > 0)
         {
-            Pack.longToLittleEndian(chainValue[full], out, outOffset + digestLength - partial, partial);
+            Pack.longToLittleEndian_Low(chainValue[full], out, outOffset + digestLength - partial, partial);
         }
 
         reset();
diff --git a/core/src/main/java/org/bouncycastle/crypto/digests/Blake2sDigest.java b/core/src/main/java/org/bouncycastle/crypto/digests/Blake2sDigest.java
@@ -502,9 +502,7 @@ public int doFinal(byte[] out, int outOffset)
         Pack.intToLittleEndian(chainValue, 0, full, out, outOffset);
         if (partial > 0)
         {
-            byte[] bytes = new byte[4];
-            Pack.intToLittleEndian(chainValue[full], bytes, 0);
-            System.arraycopy(bytes, 0, out, outOffset + digestLength - partial, partial);
+            Pack.intToLittleEndian_Low(chainValue[full], out, outOffset + digestLength - partial, partial);
         }
 
         Arrays.fill(chainValue, 0);
diff --git a/core/src/main/java/org/bouncycastle/crypto/engines/AsconAEAD128.java b/core/src/main/java/org/bouncycastle/crypto/engines/AsconAEAD128.java
@@ -85,20 +85,24 @@ protected void processFinalDecrypt(byte[] input, int inLen, byte[] output, int o
         {
             long c0 = Pack.littleEndianToLong(input, 0);
             inLen -= 8;
-            long c1 = Pack.littleEndianToLong(input, 8, inLen);
             Pack.longToLittleEndian(p.x0 ^ c0, output, outOff);
-            Pack.longToLittleEndian(p.x1 ^ c1, output, outOff + 8, inLen);
             p.x0 = c0;
-            p.x1 &= -(1L << (inLen << 3));
-            p.x1 |= c1;
+
+            if (inLen > 0)
+            {
+                long c1 = Pack.littleEndianToLong_Low(input, 8, inLen);
+                Pack.longToLittleEndian_Low(p.x1 ^ c1, output, outOff + 8, inLen);
+                p.x1 &= -(1L << (inLen << 3));
+                p.x1 |= c1;
+            }
             p.x1 ^= pad(inLen);
         }
         else
         {
-            if (inLen != 0)
+            if (inLen > 0)
             {
-                long c0 = Pack.littleEndianToLong(input, 0, inLen);
-                Pack.longToLittleEndian(p.x0 ^ c0, output, outOff, inLen);
+                long c0 = Pack.littleEndianToLong_Low(input, 0, inLen);
+                Pack.longToLittleEndian_Low(p.x0 ^ c0, output, outOff, inLen);
                 p.x0 &= -(1L << (inLen << 3));
                 p.x0 |= c0;
             }
@@ -113,17 +117,21 @@ protected void processFinalEncrypt(byte[] input, int inLen, byte[] output, int o
         {
             p.x0 ^= Pack.littleEndianToLong(input, 0);
             inLen -= 8;
-            p.x1 ^= Pack.littleEndianToLong(input, 8, inLen);
             Pack.longToLittleEndian(p.x0, output, outOff);
-            Pack.longToLittleEndian(p.x1, output, outOff + 8);
+
+            if (inLen > 0)
+            {
+                p.x1 ^= Pack.littleEndianToLong_Low(input, 8, inLen);
+                Pack.longToLittleEndian_Low(p.x1, output, outOff + 8, inLen);
+            }
             p.x1 ^= pad(inLen);
         }
         else
         {
-            if (inLen != 0)
+            if (inLen > 0)
             {
-                p.x0 ^= Pack.littleEndianToLong(input, 0, inLen);
-                Pack.longToLittleEndian(p.x0, output, outOff, inLen);
+                p.x0 ^= Pack.littleEndianToLong_Low(input, 0, inLen);
+                Pack.longToLittleEndian_Low(p.x0, output, outOff, inLen);
             }
             p.x0 ^= pad(inLen);
         }
diff --git a/core/src/main/java/org/bouncycastle/crypto/engines/AsconEngine.java b/core/src/main/java/org/bouncycastle/crypto/engines/AsconEngine.java
@@ -126,23 +126,23 @@ protected void processFinalDecrypt(byte[] input, int inLen, byte[] output, int o
             outOff += 8;
             inLen -= 8;
             p.x1 ^= pad(inLen);
-            if (inLen != 0)
+            if (inLen > 0)
             {
-                long c1 = Pack.littleEndianToLong_High(input, 8, inLen);
+                long c1 = Pack.bigEndianToLong_High(input, 8, inLen);
                 p.x1 ^= c1;
-                Pack.longToLittleEndian_High(p.x1, output, outOff, inLen);
+                Pack.longToBigEndian_High(p.x1, output, outOff, inLen);
                 p.x1 &= -1L >>> (inLen << 3);
                 p.x1 ^= c1;
             }
         }
         else
         {
             p.x0 ^= pad(inLen);
-            if (inLen != 0)
+            if (inLen > 0)
             {
-                long c0 = Pack.littleEndianToLong_High(input, 0, inLen);
+                long c0 = Pack.bigEndianToLong_High(input, 0, inLen);
                 p.x0 ^= c0;
-                Pack.longToLittleEndian_High(p.x0, output, outOff, inLen);
+                Pack.longToBigEndian_High(p.x0, output, outOff, inLen);
                 p.x0 &= -1L >>> (inLen << 3);
                 p.x0 ^= c0;
             }
@@ -160,19 +160,19 @@ protected void processFinalEncrypt(byte[] input, int inLen, byte[] output, int o
             outOff += 8;
             inLen -= 8;
             p.x1 ^= pad(inLen);
-            if (inLen != 0)
+            if (inLen > 0)
             {
-                p.x1 ^= Pack.littleEndianToLong_High(input, 8, inLen);
-                Pack.longToLittleEndian_High(p.x1, output, outOff, inLen);
+                p.x1 ^= Pack.bigEndianToLong_High(input, 8, inLen);
+                Pack.longToBigEndian_High(p.x1, output, outOff, inLen);
             }
         }
         else
         {
             p.x0 ^= pad(inLen);
-            if (inLen != 0)
+            if (inLen > 0)
             {
-                p.x0 ^= Pack.littleEndianToLong_High(input, 0, inLen);
-                Pack.longToLittleEndian_High(p.x0, output, outOff, inLen);
+                p.x0 ^= Pack.bigEndianToLong_High(input, 0, inLen);
+                Pack.longToBigEndian_High(p.x0, output, outOff, inLen);
             }
         }
         finishData(State.EncFinal);
diff --git a/core/src/main/java/org/bouncycastle/pqc/crypto/mayo/Utils.java b/core/src/main/java/org/bouncycastle/pqc/crypto/mayo/Utils.java
@@ -26,7 +26,7 @@ public static void unpackMVecs(byte[] in, int inOff, long[] out, int outOff, int
             {
                 out[outOff + j] = Pack.littleEndianToLong(in, inOff + (j << 3));
             }
-            out[outOff + j] = Pack.littleEndianToLong(in, inOff + (j << 3), lastblockLen);
+            out[outOff + j] = lastblockLen <= 0 ? 0L : Pack.littleEndianToLong_Low(in, inOff + (j << 3), lastblockLen);
         }
     }
 
@@ -52,7 +52,10 @@ public static void packMVecs(long[] in, byte[] out, int outOff, int vecs, int m)
             {
                 Pack.longToLittleEndian(in[inOff + j], out, outOff + (j << 3));
             }
-            Pack.longToLittleEndian(in[inOff + j], out, outOff + (j << 3), lastBlockLen);
+            if (lastBlockLen > 0)
+            {
+                Pack.longToLittleEndian_Low(in[inOff + j], out, outOff + (j << 3), lastBlockLen);
+            }
         }
     }
 
diff --git a/core/src/main/java/org/bouncycastle/util/Pack.java b/core/src/main/java/org/bouncycastle/util/Pack.java

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ protected long loadBytes(final byte[] bytes, int inOff)`
`58`	`58`
`59`	`59`	`protected long loadBytes(final byte[] bytes, int inOff, int n)`
`60`	`60`	`{`
`61`		`- return Pack.littleEndianToLong(bytes, inOff, n);`
	`61`	`+ return n <= 0 ? 0L : Pack.littleEndianToLong_Low(bytes, inOff, n);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`protected void setBytes(long w, byte[] bytes, int inOff)`
`@@ -68,7 +68,10 @@ protected void setBytes(long w, byte[] bytes, int inOff)`
`68`	`68`
`69`	`69`	`protected void setBytes(long w, byte[] bytes, int inOff, int n)`
`70`	`70`	`{`
`71`		`- Pack.longToLittleEndian(w, bytes, inOff, n);`
	`71`	`+ if (n > 0)`
	`72`	`+ {`
	`73`	`+ Pack.longToLittleEndian_Low(w, bytes, inOff, n);`
	`74`	`+ }`
`72`	`75`	`}`
`73`	`76`
`74`	`77`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ protected long loadBytes(final byte[] bytes, int inOff)`
`53`	`53`
`54`	`54`	`protected long loadBytes(final byte[] bytes, int inOff, int n)`
`55`	`55`	`{`
`56`		`- return Pack.bigEndianToLong(bytes, inOff, n);`
	`56`	`+ return n <= 0 ? 0L : Pack.bigEndianToLong_High(bytes, inOff, n);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`protected void setBytes(long w, byte[] bytes, int inOff)`
`@@ -63,7 +63,10 @@ protected void setBytes(long w, byte[] bytes, int inOff)`
`63`	`63`
`64`	`64`	`protected void setBytes(long w, byte[] bytes, int inOff, int n)`
`65`	`65`	`{`
`66`		`- Pack.longToBigEndian(w, bytes, inOff, n);`
	`66`	`+ if (n > 0)`
	`67`	`+ {`
	`68`	`+ Pack.longToBigEndian_High(w, bytes, inOff, n);`
	`69`	`+ }`
`67`	`70`	`}`
`68`	`71`
`69`	`72`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ protected long loadBytes(final byte[] bytes, int inOff)`
`34`	`34`
`35`	`35`	`protected long loadBytes(final byte[] bytes, int inOff, int n)`
`36`	`36`	`{`
`37`		`- return Pack.littleEndianToLong(bytes, inOff, n);`
	`37`	`+ return n <= 0 ? 0L : Pack.littleEndianToLong_Low(bytes, inOff, n);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`protected void setBytes(long w, byte[] bytes, int inOff)`
`@@ -44,7 +44,10 @@ protected void setBytes(long w, byte[] bytes, int inOff)`
`44`	`44`
`45`	`45`	`protected void setBytes(long w, byte[] bytes, int inOff, int n)`
`46`	`46`	`{`
`47`		`- Pack.longToLittleEndian(w, bytes, inOff, n);`
	`47`	`+ if (n > 0)`
	`48`	`+ {`
	`49`	`+ Pack.longToLittleEndian_Low(w, bytes, inOff, n);`
	`50`	`+ }`
`48`	`51`	`}`
`49`	`52`
`50`	`53`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ protected long loadBytes(final byte[] bytes, int inOff)`
`54`	`54`
`55`	`55`	`protected long loadBytes(final byte[] bytes, int inOff, int n)`
`56`	`56`	`{`
`57`		`- return Pack.bigEndianToLong(bytes, inOff, n);`
	`57`	`+ return n <= 0 ? 0L : Pack.bigEndianToLong_High(bytes, inOff, n);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`protected void setBytes(long w, byte[] bytes, int inOff)`
`@@ -64,7 +64,10 @@ protected void setBytes(long w, byte[] bytes, int inOff)`
`64`	`64`
`65`	`65`	`protected void setBytes(long w, byte[] bytes, int inOff, int n)`
`66`	`66`	`{`
`67`		`- Pack.longToBigEndian(w, bytes, inOff, n);`
	`67`	`+ if (n > 0)`
	`68`	`+ {`
	`69`	`+ Pack.longToBigEndian_High(w, bytes, inOff, n);`
	`70`	`+ }`
`68`	`71`	`}`
`69`	`72`
`70`	`73`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ protected long loadBytes(final byte[] bytes, int inOff)`
`35`	`35`
`36`	`36`	`protected long loadBytes(final byte[] bytes, int inOff, int n)`
`37`	`37`	`{`
`38`		`- return Pack.littleEndianToLong(bytes, inOff, n);`
	`38`	`+ return n <= 0 ? 0L : Pack.littleEndianToLong_Low(bytes, inOff, n);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`protected void setBytes(long w, byte[] bytes, int inOff)`
`@@ -45,7 +45,10 @@ protected void setBytes(long w, byte[] bytes, int inOff)`
`45`	`45`
`46`	`46`	`protected void setBytes(long w, byte[] bytes, int inOff, int n)`
`47`	`47`	`{`
`48`		`- Pack.longToLittleEndian(w, bytes, inOff, n);`
	`48`	`+ if (n > 0)`
	`49`	`+ {`
	`50`	`+ Pack.longToLittleEndian_Low(w, bytes, inOff, n);`
	`51`	`+ }`
`49`	`52`	`}`
`50`	`53`
`51`	`54`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ public int doFinal(byte[] out, int outOffset)`
`482`	`482`	`Pack.longToLittleEndian(chainValue, 0, full, out, outOffset);`
`483`	`483`	`if (partial > 0)`
`484`	`484`	`{`
`485`		`- Pack.longToLittleEndian(chainValue[full], out, outOffset + digestLength - partial, partial);`
	`485`	`+ Pack.longToLittleEndian_Low(chainValue[full], out, outOffset + digestLength - partial, partial);`
`486`	`486`	`}`
`487`	`487`
`488`	`488`	`reset();`
Original file line number	Diff line number	Diff line change
`@@ -502,9 +502,7 @@ public int doFinal(byte[] out, int outOffset)`
`502`	`502`	`Pack.intToLittleEndian(chainValue, 0, full, out, outOffset);`
`503`	`503`	`if (partial > 0)`
`504`	`504`	`{`
`505`		`- byte[] bytes = new byte[4];`
`506`		`- Pack.intToLittleEndian(chainValue[full], bytes, 0);`
`507`		`- System.arraycopy(bytes, 0, out, outOffset + digestLength - partial, partial);`
	`505`	`+ Pack.intToLittleEndian_Low(chainValue[full], out, outOffset + digestLength - partial, partial);`
`508`	`506`	`}`
`509`	`507`
`510`	`508`	`Arrays.fill(chainValue, 0);`
Original file line number	Diff line number	Diff line change
`@@ -85,20 +85,24 @@ protected void processFinalDecrypt(byte[] input, int inLen, byte[] output, int o`
`85`	`85`	`{`
`86`	`86`	`long c0 = Pack.littleEndianToLong(input, 0);`
`87`	`87`	`inLen -= 8;`
`88`		`- long c1 = Pack.littleEndianToLong(input, 8, inLen);`
`89`	`88`	`Pack.longToLittleEndian(p.x0 ^ c0, output, outOff);`
`90`		`- Pack.longToLittleEndian(p.x1 ^ c1, output, outOff + 8, inLen);`
`91`	`89`	`p.x0 = c0;`
`92`		`- p.x1 &= -(1L << (inLen << 3));`
`93`		`- p.x1 \|= c1;`
	`90`	`+`
	`91`	`+ if (inLen > 0)`
	`92`	`+ {`
	`93`	`+ long c1 = Pack.littleEndianToLong_Low(input, 8, inLen);`
	`94`	`+ Pack.longToLittleEndian_Low(p.x1 ^ c1, output, outOff + 8, inLen);`
	`95`	`+ p.x1 &= -(1L << (inLen << 3));`
	`96`	`+ p.x1 \|= c1;`
	`97`	`+ }`
`94`	`98`	`p.x1 ^= pad(inLen);`
`95`	`99`	`}`
`96`	`100`	`else`
`97`	`101`	`{`
`98`		`- if (inLen != 0)`
	`102`	`+ if (inLen > 0)`
`99`	`103`	`{`
`100`		`- long c0 = Pack.littleEndianToLong(input, 0, inLen);`
`101`		`- Pack.longToLittleEndian(p.x0 ^ c0, output, outOff, inLen);`
	`104`	`+ long c0 = Pack.littleEndianToLong_Low(input, 0, inLen);`
	`105`	`+ Pack.longToLittleEndian_Low(p.x0 ^ c0, output, outOff, inLen);`
`102`	`106`	`p.x0 &= -(1L << (inLen << 3));`
`103`	`107`	`p.x0 \|= c0;`
`104`	`108`	`}`
`@@ -113,17 +117,21 @@ protected void processFinalEncrypt(byte[] input, int inLen, byte[] output, int o`
`113`	`117`	`{`
`114`	`118`	`p.x0 ^= Pack.littleEndianToLong(input, 0);`
`115`	`119`	`inLen -= 8;`
`116`		`- p.x1 ^= Pack.littleEndianToLong(input, 8, inLen);`
`117`	`120`	`Pack.longToLittleEndian(p.x0, output, outOff);`
`118`		`- Pack.longToLittleEndian(p.x1, output, outOff + 8);`
	`121`	`+`
	`122`	`+ if (inLen > 0)`
	`123`	`+ {`
	`124`	`+ p.x1 ^= Pack.littleEndianToLong_Low(input, 8, inLen);`
	`125`	`+ Pack.longToLittleEndian_Low(p.x1, output, outOff + 8, inLen);`
	`126`	`+ }`
`119`	`127`	`p.x1 ^= pad(inLen);`
`120`	`128`	`}`
`121`	`129`	`else`
`122`	`130`	`{`
`123`		`- if (inLen != 0)`
	`131`	`+ if (inLen > 0)`
`124`	`132`	`{`
`125`		`- p.x0 ^= Pack.littleEndianToLong(input, 0, inLen);`
`126`		`- Pack.longToLittleEndian(p.x0, output, outOff, inLen);`
	`133`	`+ p.x0 ^= Pack.littleEndianToLong_Low(input, 0, inLen);`
	`134`	`+ Pack.longToLittleEndian_Low(p.x0, output, outOff, inLen);`
`127`	`135`	`}`
`128`	`136`	`p.x0 ^= pad(inLen);`
`129`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,23 +126,23 @@ protected void processFinalDecrypt(byte[] input, int inLen, byte[] output, int o`
`126`	`126`	`outOff += 8;`
`127`	`127`	`inLen -= 8;`
`128`	`128`	`p.x1 ^= pad(inLen);`
`129`		`- if (inLen != 0)`
	`129`	`+ if (inLen > 0)`
`130`	`130`	`{`
`131`		`- long c1 = Pack.littleEndianToLong_High(input, 8, inLen);`
	`131`	`+ long c1 = Pack.bigEndianToLong_High(input, 8, inLen);`
`132`	`132`	`p.x1 ^= c1;`
`133`		`- Pack.longToLittleEndian_High(p.x1, output, outOff, inLen);`
	`133`	`+ Pack.longToBigEndian_High(p.x1, output, outOff, inLen);`
`134`	`134`	`p.x1 &= -1L >>> (inLen << 3);`
`135`	`135`	`p.x1 ^= c1;`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`	`else`
`139`	`139`	`{`
`140`	`140`	`p.x0 ^= pad(inLen);`
`141`		`- if (inLen != 0)`
	`141`	`+ if (inLen > 0)`
`142`	`142`	`{`
`143`		`- long c0 = Pack.littleEndianToLong_High(input, 0, inLen);`
	`143`	`+ long c0 = Pack.bigEndianToLong_High(input, 0, inLen);`
`144`	`144`	`p.x0 ^= c0;`
`145`		`- Pack.longToLittleEndian_High(p.x0, output, outOff, inLen);`
	`145`	`+ Pack.longToBigEndian_High(p.x0, output, outOff, inLen);`
`146`	`146`	`p.x0 &= -1L >>> (inLen << 3);`
`147`	`147`	`p.x0 ^= c0;`
`148`	`148`	`}`
`@@ -160,19 +160,19 @@ protected void processFinalEncrypt(byte[] input, int inLen, byte[] output, int o`
`160`	`160`	`outOff += 8;`
`161`	`161`	`inLen -= 8;`
`162`	`162`	`p.x1 ^= pad(inLen);`
`163`		`- if (inLen != 0)`
	`163`	`+ if (inLen > 0)`
`164`	`164`	`{`
`165`		`- p.x1 ^= Pack.littleEndianToLong_High(input, 8, inLen);`
`166`		`- Pack.longToLittleEndian_High(p.x1, output, outOff, inLen);`
	`165`	`+ p.x1 ^= Pack.bigEndianToLong_High(input, 8, inLen);`
	`166`	`+ Pack.longToBigEndian_High(p.x1, output, outOff, inLen);`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`	`else`
`170`	`170`	`{`
`171`	`171`	`p.x0 ^= pad(inLen);`
`172`		`- if (inLen != 0)`
	`172`	`+ if (inLen > 0)`
`173`	`173`	`{`
`174`		`- p.x0 ^= Pack.littleEndianToLong_High(input, 0, inLen);`
`175`		`- Pack.longToLittleEndian_High(p.x0, output, outOff, inLen);`
	`174`	`+ p.x0 ^= Pack.bigEndianToLong_High(input, 0, inLen);`
	`175`	`+ Pack.longToBigEndian_High(p.x0, output, outOff, inLen);`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`	`finishData(State.EncFinal);`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static void unpackMVecs(byte[] in, int inOff, long[] out, int outOff, int`
`26`	`26`	`{`
`27`	`27`	`out[outOff + j] = Pack.littleEndianToLong(in, inOff + (j << 3));`
`28`	`28`	`}`
`29`		`- out[outOff + j] = Pack.littleEndianToLong(in, inOff + (j << 3), lastblockLen);`
	`29`	`+ out[outOff + j] = lastblockLen <= 0 ? 0L : Pack.littleEndianToLong_Low(in, inOff + (j << 3), lastblockLen);`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`@@ -52,7 +52,10 @@ public static void packMVecs(long[] in, byte[] out, int outOff, int vecs, int m)`
`52`	`52`	`{`
`53`	`53`	`Pack.longToLittleEndian(in[inOff + j], out, outOff + (j << 3));`
`54`	`54`	`}`
`55`		`- Pack.longToLittleEndian(in[inOff + j], out, outOff + (j << 3), lastBlockLen);`
	`55`	`+ if (lastBlockLen > 0)`
	`56`	`+ {`
	`57`	`+ Pack.longToLittleEndian_Low(in[inOff + j], out, outOff + (j << 3), lastBlockLen);`
	`58`	`+ }`
`56`	`59`	`}`
`57`	`60`	`}`
`58`	`61`