Format salsa / chacha core a little

Author: paulmillr

src/chacha.ts

@@ -39,9 +39,9 @@ function chachaCore(
     y12 = cnt, y13 = n[0], y14 = n[1], y15 = n[2];    // Counter  Counter	Nonce   Nonce
   // Save state to temporary variables
   let x00 = y00, x01 = y01, x02 = y02, x03 = y03,
-    x04 = y04, x05 = y05, x06 = y06, x07 = y07,
-    x08 = y08, x09 = y09, x10 = y10, x11 = y11,
-    x12 = y12, x13 = y13, x14 = y14, x15 = y15;
+      x04 = y04, x05 = y05, x06 = y06, x07 = y07,
+      x08 = y08, x09 = y09, x10 = y10, x11 = y11,
+      x12 = y12, x13 = y13, x14 = y14, x15 = y15;
   for (let r = 0; r < rounds; r += 2) {
     x00 = (x00 + x04) | 0; x12 = rotl(x12 ^ x00, 16);
     x08 = (x08 + x12) | 0; x04 = rotl(x04 ^ x08, 12);
@@ -105,9 +105,9 @@ export function hchacha(
   s: Uint32Array, k: Uint32Array, i: Uint32Array, o32: Uint32Array
 ): void {
   let x00 = s[0], x01 = s[1], x02 = s[2], x03 = s[3],
-    x04 = k[0], x05 = k[1], x06 = k[2], x07 = k[3],
-    x08 = k[4], x09 = k[5], x10 = k[6], x11 = k[7],
-    x12 = i[0], x13 = i[1], x14 = i[2], x15 = i[3];
+      x04 = k[0], x05 = k[1], x06 = k[2], x07 = k[3],
+      x08 = k[4], x09 = k[5], x10 = k[6], x11 = k[7],
+      x12 = i[0], x13 = i[1], x14 = i[2], x15 = i[3];
   for (let r = 0; r < 20; r += 2) {
     x00 = (x00 + x04) | 0; x12 = rotl(x12 ^ x00, 16);
     x08 = (x08 + x12) | 0; x04 = rotl(x04 ^ x08, 12);

src/salsa.ts

@@ -33,30 +33,30 @@ function salsaCore(
 ): void {
   // Based on https://cr.yp.to/salsa20.html
   let y00 = s[0], y01 = k[0], y02 = k[1], y03 = k[2], // "expa" Key     Key     Key
-    y04 = k[3], y05 = s[1], y06 = n[0], y07 = n[1],   // Key    "nd 3"  Nonce   Nonce
-    y08 = cnt, y09 = 0, y10 = s[2], y11 = k[4],       // Pos.   Pos.    "2-by"	Key
-    y12 = k[5], y13 = k[6], y14 = k[7], y15 = s[3];   // Key    Key     Key     "te k"
+      y04 = k[3], y05 = s[1], y06 = n[0], y07 = n[1], // Key    "nd 3"  Nonce   Nonce
+      y08 = cnt,  y09 = 0,    y10 = s[2], y11 = k[4], // Pos.   Pos.    "2-by"	Key
+      y12 = k[5], y13 = k[6], y14 = k[7], y15 = s[3]; // Key    Key     Key     "te k"
   // Save state to temporary variables
   let x00 = y00, x01 = y01, x02 = y02, x03 = y03,
-    x04 = y04, x05 = y05, x06 = y06, x07 = y07,
-    x08 = y08, x09 = y09, x10 = y10, x11 = y11,
-    x12 = y12, x13 = y13, x14 = y14, x15 = y15;
+      x04 = y04, x05 = y05, x06 = y06, x07 = y07,
+      x08 = y08, x09 = y09, x10 = y10, x11 = y11,
+      x12 = y12, x13 = y13, x14 = y14, x15 = y15;
   for (let r = 0; r < rounds; r += 2) {
-    x04 ^= rotl(x00 + x12 | 0, 7); x08 ^= rotl(x04 + x00 | 0, 9);
+    x04 ^= rotl(x00 + x12 | 0,  7); x08 ^= rotl(x04 + x00 | 0, 9);
     x12 ^= rotl(x08 + x04 | 0, 13); x00 ^= rotl(x12 + x08 | 0, 18);
-    x09 ^= rotl(x05 + x01 | 0, 7); x13 ^= rotl(x09 + x05 | 0, 9);
+    x09 ^= rotl(x05 + x01 | 0,  7); x13 ^= rotl(x09 + x05 | 0, 9);
     x01 ^= rotl(x13 + x09 | 0, 13); x05 ^= rotl(x01 + x13 | 0, 18);
-    x14 ^= rotl(x10 + x06 | 0, 7); x02 ^= rotl(x14 + x10 | 0, 9);
+    x14 ^= rotl(x10 + x06 | 0,  7); x02 ^= rotl(x14 + x10 | 0, 9);
     x06 ^= rotl(x02 + x14 | 0, 13); x10 ^= rotl(x06 + x02 | 0, 18);
-    x03 ^= rotl(x15 + x11 | 0, 7); x07 ^= rotl(x03 + x15 | 0, 9);
+    x03 ^= rotl(x15 + x11 | 0,  7); x07 ^= rotl(x03 + x15 | 0, 9);
     x11 ^= rotl(x07 + x03 | 0, 13); x15 ^= rotl(x11 + x07 | 0, 18);
-    x01 ^= rotl(x00 + x03 | 0, 7); x02 ^= rotl(x01 + x00 | 0, 9);
+    x01 ^= rotl(x00 + x03 | 0,  7); x02 ^= rotl(x01 + x00 | 0, 9);
     x03 ^= rotl(x02 + x01 | 0, 13); x00 ^= rotl(x03 + x02 | 0, 18);
-    x06 ^= rotl(x05 + x04 | 0, 7); x07 ^= rotl(x06 + x05 | 0, 9);
+    x06 ^= rotl(x05 + x04 | 0,  7); x07 ^= rotl(x06 + x05 | 0, 9);
     x04 ^= rotl(x07 + x06 | 0, 13); x05 ^= rotl(x04 + x07 | 0, 18);
-    x11 ^= rotl(x10 + x09 | 0, 7); x08 ^= rotl(x11 + x10 | 0, 9);
+    x11 ^= rotl(x10 + x09 | 0,  7); x08 ^= rotl(x11 + x10 | 0, 9);
     x09 ^= rotl(x08 + x11 | 0, 13); x10 ^= rotl(x09 + x08 | 0, 18);
-    x12 ^= rotl(x15 + x14 | 0, 7); x13 ^= rotl(x12 + x15 | 0, 9);
+    x12 ^= rotl(x15 + x14 | 0,  7); x13 ^= rotl(x12 + x15 | 0, 9);
     x14 ^= rotl(x13 + x12 | 0, 13); x15 ^= rotl(x14 + x13 | 0, 18);
   }
   // Write output
@@ -82,9 +82,9 @@ export function hsalsa(
   s: Uint32Array, k: Uint32Array, i: Uint32Array, o32: Uint32Array
 ): void {
   let x00 = s[0], x01 = k[0], x02 = k[1], x03 = k[2],
-    x04 = k[3], x05 = s[1], x06 = i[0], x07 = i[1],
-    x08 = i[2], x09 = i[3], x10 = s[2], x11 = k[4],
-    x12 = k[5], x13 = k[6], x14 = k[7], x15 = s[3];
+      x04 = k[3], x05 = s[1], x06 = i[0], x07 = i[1],
+      x08 = i[2], x09 = i[3], x10 = s[2], x11 = k[4],
+      x12 = k[5], x13 = k[6], x14 = k[7], x15 = s[3];
   for (let r = 0; r < 20; r += 2) {
     x04 ^= rotl(x00 + x12 | 0, 7); x08 ^= rotl(x04 + x00 | 0, 9);
     x12 ^= rotl(x08 + x04 | 0, 13); x00 ^= rotl(x12 + x08 | 0, 18);