Convert DES into a class

kasmweb/core/des.js

@@ -77,18 +77,14 @@
 
 /* eslint-disable comma-spacing */
 
-export default function DES(passwd) {
-    "use strict";
-
 // Tables, permutations, S-boxes, etc.
 const PC2 = [13,16,10,23, 0, 4, 2,27,14, 5,20, 9,22,18,11, 3,
              25, 7,15, 6,26,19,12, 1,40,51,30,36,46,54,29,39,
              50,44,32,47,43,48,38,55,33,52,45,41,49,35,28,31 ],
-        totrot = [ 1, 2, 4, 6, 8,10,12,14,15,17,19,21,23,25,27,28],
-        z = 0x0,
-        keys = [];
-    let a,b,c,d,e,f;
+    totrot = [ 1, 2, 4, 6, 8,10,12,14,15,17,19,21,23,25,27,28];
 
+const z = 0x0;
+let a,b,c,d,e,f;
 a=1<<16; b=1<<24; c=a|b; d=1<<2; e=1<<10; f=d|e;
 const SP1 = [c|e,z|z,a|z,c|f,c|d,a|f,z|d,a|z,z|e,c|e,c|f,z|e,b|f,c|d,b|z,z|d,
              z|f,b|e,b|e,a|e,a|e,c|z,c|z,b|f,a|d,b|d,b|d,a|d,z|z,z|f,a|f,b|z,
@@ -130,14 +126,19 @@ export default function DES(passwd) {
              a|f,a|z,c|e,z|e,z|d,c|d,z|e,a|f,b|e,z|d,b|d,c|z,c|d,b|z,a|z,b|f,
              z|z,c|f,a|d,b|d,c|z,b|e,b|f,z|z,c|f,a|e,a|e,z|f,z|f,a|d,b|z,c|e];
 
+/* eslint-enable comma-spacing */
+
+export default class DES {
+    constructor(password) {
+        this.keys = [];
+
         // Set the key.
-    function setKeys(keyBlock) {
         const pc1m = [], pcr = [], kn = [];
 
         for (let j = 0, l = 56; j < 56; ++j, l -= 8) {
             l += l < -5 ? 65 : l < -3 ? 31 : l < -1 ? 63 : l === 27 ? 35 : 0; // PC1
             const m = l & 0x7;
-            pc1m[j] = ((keyBlock[l >>> 3] & (1<<m)) !== 0) ? 1: 0;
+            pc1m[j] = ((password[l >>> 3] & (1<<m)) !== 0) ? 1: 0;
         }
 
         for (let i = 0; i < 16; ++i) {
@@ -164,21 +165,21 @@ export default function DES(passwd) {
         for (let i = 0, rawi = 0, KnLi = 0; i < 16; ++i) {
             const raw0 = kn[rawi++];
             const raw1 = kn[rawi++];
-            keys[KnLi] = (raw0 & 0x00fc0000) << 6;
-            keys[KnLi] |= (raw0 & 0x00000fc0) << 10;
-            keys[KnLi] |= (raw1 & 0x00fc0000) >>> 10;
-            keys[KnLi] |= (raw1 & 0x00000fc0) >>> 6;
+            this.keys[KnLi] = (raw0 & 0x00fc0000) << 6;
+            this.keys[KnLi] |= (raw0 & 0x00000fc0) << 10;
+            this.keys[KnLi] |= (raw1 & 0x00fc0000) >>> 10;
+            this.keys[KnLi] |= (raw1 & 0x00000fc0) >>> 6;
             ++KnLi;
-            keys[KnLi] = (raw0 & 0x0003f000) << 12;
-            keys[KnLi] |= (raw0 & 0x0000003f) << 16;
-            keys[KnLi] |= (raw1 & 0x0003f000) >>> 4;
-            keys[KnLi] |= (raw1 & 0x0000003f);
+            this.keys[KnLi] = (raw0 & 0x0003f000) << 12;
+            this.keys[KnLi] |= (raw0 & 0x0000003f) << 16;
+            this.keys[KnLi] |= (raw1 & 0x0003f000) >>> 4;
+            this.keys[KnLi] |= (raw1 & 0x0000003f);
             ++KnLi;
         }
     }
 
     // Encrypt 8 bytes of text
-    function enc8(text) {
+    enc8(text) {
         const b = text.slice();
         let i = 0, l, r, x; // left, right, accumulator
 
@@ -206,24 +207,24 @@ export default function DES(passwd) {
 
         for (let i = 0, keysi = 0; i < 8; ++i) {
             x = (r << 28) | (r >>> 4);
-            x ^= keys[keysi++];
+            x ^= this.keys[keysi++];
             let fval =  SP7[x & 0x3f];
             fval |= SP5[(x >>> 8) & 0x3f];
             fval |= SP3[(x >>> 16) & 0x3f];
             fval |= SP1[(x >>> 24) & 0x3f];
-            x = r ^ keys[keysi++];
+            x = r ^ this.keys[keysi++];
             fval |= SP8[x & 0x3f];
             fval |= SP6[(x >>> 8) & 0x3f];
             fval |= SP4[(x >>> 16) & 0x3f];
             fval |= SP2[(x >>> 24) & 0x3f];
             l ^= fval;
             x = (l << 28) | (l >>> 4);
-            x ^= keys[keysi++];
+            x ^= this.keys[keysi++];
             fval =  SP7[x & 0x3f];
             fval |= SP5[(x >>> 8) & 0x3f];
             fval |= SP3[(x >>> 16) & 0x3f];
             fval |= SP1[(x >>> 24) & 0x3f];
-            x = l ^ keys[keysi++];
+            x = l ^ this.keys[keysi++];
             fval |= SP8[x & 0x0000003f];
             fval |= SP6[(x >>> 8) & 0x3f];
             fval |= SP4[(x >>> 16) & 0x3f];
@@ -259,11 +260,7 @@ export default function DES(passwd) {
     }
 
     // Encrypt 16 bytes of text using passwd as key
-    function encrypt(t) {
-        return enc8(t.slice(0, 8)).concat(enc8(t.slice(8, 16)));
+    encrypt(t) {
+        return this.enc8(t.slice(0, 8)).concat(this.enc8(t.slice(8, 16)));
     }
-
-    setKeys(passwd);             // Setup keys
-    return {'encrypt': encrypt}; // Public interface
-
 }

kasmweb/core/rfb.js

@@ -1914,11 +1914,8 @@ export default class RFB extends EventTargetMixin {
     }
 
     static genDES(password, challenge) {
-        const passwd = [];
-        for (let i = 0; i < password.length; i++) {
-            passwd.push(password.charCodeAt(i));
-        }
-        return (new DES(passwd)).encrypt(challenge);
+        const passwordChars = password.split('').map(c => c.charCodeAt(0));
+        return (new DES(passwordChars)).encrypt(challenge);
     }
 }