iobroker.admin 6.2.2 → 6.2.3

package/README.md

@@ -108,6 +108,9 @@ The icons may not be reused in other projects without the proper flaticon licens
 -->
 
 ## Changelog
+### 6.2.3 (2022-07-18)
+* (AlCalzone) Implemented AES-192 encryption and decryption in GUI
+
 ### 6.2.2 (2022-07-18)
 * (bluefox) Corrected JSON config table and login page
 
@@ -122,9 +125,6 @@ The icons may not be reused in other projects without the proper flaticon licens
 * (bluefox) Fixed GUI issues
 * (bluefox) Release candidate 1
 
-### 6.1.10 (2022-07-04)
-* (bluefox) Fixed issue with map
-
 ## License
 The MIT License (MIT)
 

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "admin",
-    "version": "6.2.2",
+    "version": "6.2.3",
     "titleLang": {
       "en": "Admin",
       "de": "Admin",
@@ -18,6 +18,18 @@
     "connectionType": "local",
     "dataSource": "push",
     "news": {
+      "6.2.3": {
+        "en": "Implemented AES-192 encryption and decryption in GUI",
+        "de": "AES-192 Verschlüsselung und Entschlüsselung in GUI",
+        "ru": "Реализовано шифрование AES-192 и расшифровка в GUI",
+        "pt": "Implementado criptografia AES-192 e descriptografia em GUI",
+        "nl": "Vertaling:",
+        "fr": "Mise en œuvre du chiffrement et du décryptage AES-192 dans GUI",
+        "it": "Implementato AES-192 crittografia e decrittografia in GUI",
+        "es": "Cifrado y descifrado AES-192 implementado en GUI",
+        "pl": "Poprawione szyfrowanie AES-192 oraz deszyfrowanie w GUI",
+        "zh-cn": "AES-192 加密和加密集团"
+      },
       "6.2.2": {
         "en": "Corrected JSON config table and login page",
         "de": "JSON config Tabelle und Anmeldeseite korrigiert",
@@ -89,18 +101,6 @@
         "es": "Alguna GUI arreglado",
         "pl": "Niektóre rozwiązania GUI",
         "zh-cn": "一些古伊特公司做的"
-      },
-      "6.1.8": {
-        "en": "Corrected the host update instructions",
-        "de": "Korrektur der Host-Update-Anweisungen",
-        "ru": "Исправлена инструкция по обновлению хоста",
-        "pt": "Corrigido as instruções de atualização do host",
-        "nl": "Vertaling:",
-        "fr": "Correction des instructions de mise à jour de l'hôte",
-        "it": "Corretto le istruzioni di aggiornamento dell'host",
-        "es": "Corregido las instrucciones de actualización del host",
-        "pl": "Poprawiona procedura aktualizacji hosta",
-        "zh-cn": "修改东道国政府最新指示"
       }
     },
     "desc": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "iobroker.admin",
   "description": "The adapter opens a webserver for the ioBroker admin UI.",
-  "version": "6.2.2",
+  "version": "6.2.3",
   "contributors": [
     "bluefox <dogafox@gmail.com>",
     "apollon77",

package/www/asset-manifest.json

@@ -1,8 +1,8 @@
 {
   "files": {
-    "main.js": "./static/js/main.dec36354.js",
+    "main.js": "./static/js/main.d3df889c.js",
     "static/css/5710.d6229a1b.chunk.css": "./static/css/5710.d6229a1b.chunk.css",
-    "static/js/5710.66d0a0cb.chunk.js": "./static/js/5710.66d0a0cb.chunk.js",
+    "static/js/5710.44014f30.chunk.js": "./static/js/5710.44014f30.chunk.js",
     "static/js/6090.d1503f4f.chunk.js": "./static/js/6090.d1503f4f.chunk.js",
     "static/js/9039.4c211996.chunk.js": "./static/js/9039.4c211996.chunk.js",
     "static/js/2652.9a062c3e.chunk.js": "./static/js/2652.9a062c3e.chunk.js",
@@ -176,7 +176,7 @@
     "static/js/4191.a518a3ff.chunk.js": "./static/js/4191.a518a3ff.chunk.js",
     "static/js/2486.a8ed5e8f.chunk.js": "./static/js/2486.a8ed5e8f.chunk.js",
     "static/js/6322.763e2306.chunk.js": "./static/js/6322.763e2306.chunk.js",
-    "static/js/8596.ff72c56e.chunk.js": "./static/js/8596.ff72c56e.chunk.js",
+    "static/js/8596.eecce458.chunk.js": "./static/js/8596.eecce458.chunk.js",
     "worker-xquery.js": "./744aef747001c7b433be1c2506249a70.js",
     "static/media/wizard-welcome.jpg": "./static/media/wizard-welcome.06f62f65d3031a66f279.jpg",
     "worker-javascript.js": "./542e43220c9098c8a7c5bcb91772c1bd.js",
@@ -769,9 +769,9 @@
     "jsx.js": "./ffd3b83e8b5878f4785591ff54b1dfff.js",
     "d.js": "./70074e0c785c9a808dea76c7c7d17af3.js",
     "mode-text.js": "./25718a469574ade47e23567d8c543169.js",
-    "main.dec36354.js.map": "./static/js/main.dec36354.js.map",
+    "main.d3df889c.js.map": "./static/js/main.d3df889c.js.map",
     "5710.d6229a1b.chunk.css.map": "./static/css/5710.d6229a1b.chunk.css.map",
-    "5710.66d0a0cb.chunk.js.map": "./static/js/5710.66d0a0cb.chunk.js.map",
+    "5710.44014f30.chunk.js.map": "./static/js/5710.44014f30.chunk.js.map",
     "6090.d1503f4f.chunk.js.map": "./static/js/6090.d1503f4f.chunk.js.map",
     "9039.4c211996.chunk.js.map": "./static/js/9039.4c211996.chunk.js.map",
     "2652.9a062c3e.chunk.js.map": "./static/js/2652.9a062c3e.chunk.js.map",
@@ -946,9 +946,9 @@
     "4191.a518a3ff.chunk.js.map": "./static/js/4191.a518a3ff.chunk.js.map",
     "2486.a8ed5e8f.chunk.js.map": "./static/js/2486.a8ed5e8f.chunk.js.map",
     "6322.763e2306.chunk.js.map": "./static/js/6322.763e2306.chunk.js.map",
-    "8596.ff72c56e.chunk.js.map": "./static/js/8596.ff72c56e.chunk.js.map"
+    "8596.eecce458.chunk.js.map": "./static/js/8596.eecce458.chunk.js.map"
   },
   "entrypoints": [
-    "static/js/main.dec36354.js"
+    "static/js/main.d3df889c.js"
   ]
 }

package/www/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/><meta name="theme-color" content="#000000"/><meta name="description" content="admin - ioBroker"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="stylesheet" href="./css/leaflet.css"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" onerror="setTimeout(function(){window.location.reload()}, 5000)" src="./lib/js/socket.io.js"></script><script type="text/javascript" src="./lib/js/sparkline.js"></script><title>Admin</title><script>window.loginHideLogo="@@loginHideLogo@@",window.loginMotto="@@loginMotto@@",window.login="@@auth@@",window.loginLogo="@@loginLogo@@",window.loginLink="@@loginLink@@",window.loginTitle="@@loginTitle@@",window.loginBackgroundColor="@@loginBackgroundColor@@",window.loginBackgroundImage="@@loginBackgroundImage@@",window.vendorPrefix="@@vendorPrefix@@",window.disableDataReporting="@@disableDataReporting@@",window.loadingBackgroundColor="@@loadingBackgroundColor@@",window.loadingBackgroundImage="@@loadingBackgroundImage@@",window.loadingHideLogo="@@loadingHideLogo@@"</script><style>.root{background-color:rgba(255,255,255,.87);border-radius:10px}.unsupported{width:200px;background-color:#aaa;margin:auto;margin-top:3rem;padding:10px;line-height:25px;border-radius:4px;text-align:center}.leaflet-container{height:400px;width:100%}</style><script>setTimeout((()=>{const o=document.body;window.location.search.includes("?login")?(window.loginBackgroundColor&&-1===window.loginBackgroundColor.indexOf("loginBackgroundColor")&&(o.style.backgroundColor=window.loginBackgroundColor),window.loginBackgroundImage&&-1===window.loginBackgroundImage.indexOf("loginBackgroundImage")&&(o.style.backgroundImage="url("+window.loginBackgroundImage+")",o.style.backgroundSize="cover")):(window.loadingBackgroundColor&&-1===window.loadingBackgroundColor.indexOf("loadingBackgroundColor")&&(o.style.backgroundColor=window.loadingBackgroundColor),window.loadingBackgroundImage&&-1===window.loadingBackgroundImage.indexOf("loadingBackgroundImage")&&(o.style.backgroundImage="url("+window.loadingBackgroundImage+")",o.style.backgroundSize="cover"))}),0),window.addEventListener("load",(function o(n){window.removeEventListener("load",o,!1);if(window.navigator.userAgent.indexOf("MSIE ")>0||navigator.userAgent.match(/Trident.*rv\:11\./)){const o=document.getElementById("root");o.classList.add("unsupported"),o.innerHTML="Browser is not supported. Please use Firefox or Chrome."}}),!1)</script><script defer="defer" src="./static/js/main.dec36354.js"></script></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/><meta name="theme-color" content="#000000"/><meta name="description" content="admin - ioBroker"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="stylesheet" href="./css/leaflet.css"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" onerror="setTimeout(function(){window.location.reload()}, 5000)" src="./lib/js/socket.io.js"></script><script type="text/javascript" src="./lib/js/sparkline.js"></script><title>Admin</title><script>window.loginHideLogo="@@loginHideLogo@@",window.loginMotto="@@loginMotto@@",window.login="@@auth@@",window.loginLogo="@@loginLogo@@",window.loginLink="@@loginLink@@",window.loginTitle="@@loginTitle@@",window.loginBackgroundColor="@@loginBackgroundColor@@",window.loginBackgroundImage="@@loginBackgroundImage@@",window.vendorPrefix="@@vendorPrefix@@",window.disableDataReporting="@@disableDataReporting@@",window.loadingBackgroundColor="@@loadingBackgroundColor@@",window.loadingBackgroundImage="@@loadingBackgroundImage@@",window.loadingHideLogo="@@loadingHideLogo@@"</script><style>.root{background-color:rgba(255,255,255,.87);border-radius:10px}.unsupported{width:200px;background-color:#aaa;margin:auto;margin-top:3rem;padding:10px;line-height:25px;border-radius:4px;text-align:center}.leaflet-container{height:400px;width:100%}</style><script>setTimeout((()=>{const o=document.body;window.location.search.includes("?login")?(window.loginBackgroundColor&&-1===window.loginBackgroundColor.indexOf("loginBackgroundColor")&&(o.style.backgroundColor=window.loginBackgroundColor),window.loginBackgroundImage&&-1===window.loginBackgroundImage.indexOf("loginBackgroundImage")&&(o.style.backgroundImage="url("+window.loginBackgroundImage+")",o.style.backgroundSize="cover")):(window.loadingBackgroundColor&&-1===window.loadingBackgroundColor.indexOf("loadingBackgroundColor")&&(o.style.backgroundColor=window.loadingBackgroundColor),window.loadingBackgroundImage&&-1===window.loadingBackgroundImage.indexOf("loadingBackgroundImage")&&(o.style.backgroundImage="url("+window.loadingBackgroundImage+")",o.style.backgroundSize="cover"))}),0),window.addEventListener("load",(function o(n){window.removeEventListener("load",o,!1);if(window.navigator.userAgent.indexOf("MSIE ")>0||navigator.userAgent.match(/Trident.*rv\:11\./)){const o=document.getElementById("root");o.classList.add("unsupported"),o.innerHTML="Browser is not supported. Please use Firefox or Chrome."}}),!1)</script><script defer="defer" src="./static/js/main.d3df889c.js"></script></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

package/www/js/adapter-settings.js

@@ -424,6 +424,34 @@ function preInit () {
         }
     }
 
+    function _load(native, onChange) {
+        load(native, onChange);
+
+        // init selects
+        if (isMaterialize) {
+            $('select').select();
+            M.updateTextFields();
+
+            // workaround for materialize checkbox problem
+            $('input[type="checkbox"]+span').off('click').on('click', function (event) {
+                var $input = $(this).prev();
+                if (!$input.prop('disabled')) {
+                    $input.prop('checked', !$input.prop('checked')).trigger('change');
+                    // prevent propagation to prevent original handling from reverting our value change
+                    event.preventDefault();
+                    event.stopImmediatePropagation();
+                }
+            });
+        }
+    }
+
+    function loadScript(src, onload) {
+        var script = document.createElement('script');
+        script.onload = onload
+        script.src = src;
+        document.getElementsByTagName('head')[0].appendChild(script);
+    }
+
     function loadSettings(callback) {
         socket.emit('getObject', id, async function (err, res) {
             if (!err && res && res.native) {
@@ -436,11 +464,16 @@ function preInit () {
                 } else {
                     // decode all native attributes listed in res.encryptedNative
                     if (res.encryptedNative && typeof res.encryptedNative === 'object' && res.encryptedNative instanceof Array) {
-                        for (var i = 0; i < res.encryptedNative.length; i++) {
-                            if (res.native[res.encryptedNative[i]]) {
-                                res.native[res.encryptedNative[i]] = await decrypt(res.native[res.encryptedNative[i]]);
+                        // load crypto library
+                        loadScript('../../lib/js/crypto-js/crypto-js.js', function () {
+                            for (var i = 0; i < res.encryptedNative.length; i++) {
+                                if (res.native[res.encryptedNative[i]]) {
+                                    res.native[res.encryptedNative[i]] = decrypt(res.native[res.encryptedNative[i]]);
+                                }
                             }
-                        }
+
+                            _load(res.native, onChange);
+                        });
                     } else {
                         var idx = supportedFeatures.indexOf('ADAPTER_AUTO_DECRYPT_NATIVE');
                         if (idx !== -1) {
@@ -449,23 +482,7 @@ function preInit () {
                         }
                     }
 
-                    load(res.native, onChange);
-                    // init selects
-                    if (isMaterialize) {
-                        $('select').select();
-                        M.updateTextFields();
-
-                        // workaround for materialize checkbox problem
-                        $('input[type="checkbox"]+span').off('click').on('click', function (event) {
-                            var $input = $(this).prev();
-                            if (!$input.prop('disabled')) {
-                                $input.prop('checked', !$input.prop('checked')).trigger('change');
-                                // prevent propagation to prevent original handling from reverting our value change
-                                event.preventDefault();
-                                event.stopImmediatePropagation();
-                            }
-                        });
-                    }
+                    _load(res.native, onChange);
                 }
                 if (typeof callback === 'function') {
                     callback();
@@ -2421,7 +2438,7 @@ function decryptLegacy(key, value) {
         key = systemSecret;
     }
     var result = '';
-    for(var i = 0; i < value.length; i++) {
+    for (var i = 0; i < value.length; i++) {
         result += String.fromCharCode(key[i % key.length].charCodeAt(0) ^ value.charCodeAt(i));
     }
     return result;
@@ -2472,40 +2489,23 @@ async function decrypt(key, value) {
     }
 
     // if not encrypted as aes-192 or key not a valid 48 digit hex -> fallback
-    if (!value.startsWith(`$/aes-256-cbc:`) || !/^[0-9a-f]{64}$/.test(key)) {
+    if (!value.startsWith(`$/aes-192-cbc:`) || !/^[0-9a-f]{48}$/.test(key)) {
         return decryptLegacy(key, value);
     }
 
+    // algorithm:iv:encryptedValue
     var textParts = value.split(':', 3);
-    // var algorithm = textParts[0];
-    var valueEncBytes = new Uint8Array(hex2array(textParts[2]));
-
-    var iv = new Uint8Array(hex2array(textParts[1]));
-    var _key = await window.crypto.subtle.importKey('raw', hex2array(key), { name: 'AES-CBC' }, true, ['encrypt', 'decrypt']);
-    var dec = await window.crypto.subtle.decrypt({ name: 'AES-CBC', iv }, _key, valueEncBytes.buffer);
-    var decBytes = new Uint8Array(dec);
-    return new TextDecoder().decode(decBytes);
-}
 
-function hex2array(hex) {
-    var bytes = new Uint8Array(Math.ceil(hex.length / 2));
-    for (var i = 0; i < bytes.length; i++) {
-        bytes[i] = parseInt(hex.substr(i * 2, 2), 16);
-    }
-    return bytes;
-}
+    var _key = CryptoJS.enc.Hex.parse(key);
+    var iv = CryptoJS.enc.Hex.parse(textParts[1]);
 
-function array2hex(bytes) {
-    var convertedBack = '';
-    for (var i = 0; i < bytes.length; i++) {
-        if (bytes[i] < 16) {
-            convertedBack += '0';
-        }
-        convertedBack += bytes[i].toString(16);
-    }
+    var cipherParams = CryptoJS.lib.CipherParams.create({ ciphertext: CryptoJS.enc.Hex.parse(textParts[2]) });
+
+    var decryptedBinary = CryptoJS.AES.decrypt(cipherParams, _key, { iv: iv });
 
-    return convertedBack;
+    return CryptoJS.enc.Utf8.stringify(decryptedBinary);
 }
+
 /**
  * Encrypt the password/value with given key
  *  Usage:
@@ -2522,6 +2522,7 @@ function array2hex(bytes) {
  *  ```
  * @param {string} key - Secret key
  * @param {string} value - value to encrypt
+ * @param {string} _iv - optional initial vector for tests
  * @returns {string}
  */
 async function encrypt(key, value, _iv) {
@@ -2534,25 +2535,22 @@ async function encrypt(key, value, _iv) {
         return value;
     }
 
-    if (!/^[0-9a-f]{64}$/.test(key)) {
+    if (!/^[0-9a-f]{48}$/.test(key)) {
         // key length is not matching for AES-192-CBC or key is no valid hex - fallback to old encryption
         return encryptLegacy(key, value);
     }
 
-    var valueBytes = new TextEncoder().encode(value);
     var iv;
     if (_iv) {
-        iv = hex2array(_iv);
+        iv = CryptoJS.enc.Hex.parse(_iv);
     } else {
-        iv = new Uint8Array(16);
-        window.crypto.getRandomValues(iv);
+        iv = CryptoJS.lib.WordArray.random(128 / 8);
     }
 
-    var _key = await window.crypto.subtle.importKey('raw', hex2array(key), { name: 'AES-CBC' }, true, ['encrypt', 'decrypt']);
-    var enc = await window.crypto.subtle.encrypt({name: 'AES-CBC', iv}, _key, valueBytes);
-    var encBytes = new Uint8Array(enc);
+    var _key = CryptoJS.enc.Hex.parse(key);
+    var encrypted = CryptoJS.AES.encrypt(value, _key, { iv: iv }).ciphertext;
 
-    return `$/aes-256-cbc:${array2hex(iv)}:${array2hex(encBytes)}`;
+    return `$/aes-192-cbc:${window.CryptoJS.enc.Hex.stringify(iv)}:${encrypted}`;
 }
 
 // current Theme Style for Adapter CSS settings

package/www/lib/js/crypto-js/aes.js

@@ -0,0 +1,234 @@
+;(function (root, factory, undef) {
+	if (typeof exports === "object") {
+		// CommonJS
+		module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+	}
+	else if (typeof define === "function" && define.amd) {
+		// AMD
+		define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+	}
+	else {
+		// Global (browser)
+		factory(root.CryptoJS);
+	}
+}(this, function (CryptoJS) {
+
+	(function () {
+	    // Shortcuts
+	    var C = CryptoJS;
+	    var C_lib = C.lib;
+	    var BlockCipher = C_lib.BlockCipher;
+	    var C_algo = C.algo;
+
+	    // Lookup tables
+	    var SBOX = [];
+	    var INV_SBOX = [];
+	    var SUB_MIX_0 = [];
+	    var SUB_MIX_1 = [];
+	    var SUB_MIX_2 = [];
+	    var SUB_MIX_3 = [];
+	    var INV_SUB_MIX_0 = [];
+	    var INV_SUB_MIX_1 = [];
+	    var INV_SUB_MIX_2 = [];
+	    var INV_SUB_MIX_3 = [];
+
+	    // Compute lookup tables
+	    (function () {
+	        // Compute double table
+	        var d = [];
+	        for (var i = 0; i < 256; i++) {
+	            if (i < 128) {
+	                d[i] = i << 1;
+	            } else {
+	                d[i] = (i << 1) ^ 0x11b;
+	            }
+	        }
+
+	        // Walk GF(2^8)
+	        var x = 0;
+	        var xi = 0;
+	        for (var i = 0; i < 256; i++) {
+	            // Compute sbox
+	            var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4);
+	            sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63;
+	            SBOX[x] = sx;
+	            INV_SBOX[sx] = x;
+
+	            // Compute multiplication
+	            var x2 = d[x];
+	            var x4 = d[x2];
+	            var x8 = d[x4];
+
+	            // Compute sub bytes, mix columns tables
+	            var t = (d[sx] * 0x101) ^ (sx * 0x1010100);
+	            SUB_MIX_0[x] = (t << 24) | (t >>> 8);
+	            SUB_MIX_1[x] = (t << 16) | (t >>> 16);
+	            SUB_MIX_2[x] = (t << 8)  | (t >>> 24);
+	            SUB_MIX_3[x] = t;
+
+	            // Compute inv sub bytes, inv mix columns tables
+	            var t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100);
+	            INV_SUB_MIX_0[sx] = (t << 24) | (t >>> 8);
+	            INV_SUB_MIX_1[sx] = (t << 16) | (t >>> 16);
+	            INV_SUB_MIX_2[sx] = (t << 8)  | (t >>> 24);
+	            INV_SUB_MIX_3[sx] = t;
+
+	            // Compute next counter
+	            if (!x) {
+	                x = xi = 1;
+	            } else {
+	                x = x2 ^ d[d[d[x8 ^ x2]]];
+	                xi ^= d[d[xi]];
+	            }
+	        }
+	    }());
+
+	    // Precomputed Rcon lookup
+	    var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
+
+	    /**
+	     * AES block cipher algorithm.
+	     */
+	    var AES = C_algo.AES = BlockCipher.extend({
+	        _doReset: function () {
+	            var t;
+
+	            // Skip reset of nRounds has been set before and key did not change
+	            if (this._nRounds && this._keyPriorReset === this._key) {
+	                return;
+	            }
+
+	            // Shortcuts
+	            var key = this._keyPriorReset = this._key;
+	            var keyWords = key.words;
+	            var keySize = key.sigBytes / 4;
+
+	            // Compute number of rounds
+	            var nRounds = this._nRounds = keySize + 6;
+
+	            // Compute number of key schedule rows
+	            var ksRows = (nRounds + 1) * 4;
+
+	            // Compute key schedule
+	            var keySchedule = this._keySchedule = [];
+	            for (var ksRow = 0; ksRow < ksRows; ksRow++) {
+	                if (ksRow < keySize) {
+	                    keySchedule[ksRow] = keyWords[ksRow];
+	                } else {
+	                    t = keySchedule[ksRow - 1];
+
+	                    if (!(ksRow % keySize)) {
+	                        // Rot word
+	                        t = (t << 8) | (t >>> 24);
+
+	                        // Sub word
+	                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+
+	                        // Mix Rcon
+	                        t ^= RCON[(ksRow / keySize) | 0] << 24;
+	                    } else if (keySize > 6 && ksRow % keySize == 4) {
+	                        // Sub word
+	                        t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+	                    }
+
+	                    keySchedule[ksRow] = keySchedule[ksRow - keySize] ^ t;
+	                }
+	            }
+
+	            // Compute inv key schedule
+	            var invKeySchedule = this._invKeySchedule = [];
+	            for (var invKsRow = 0; invKsRow < ksRows; invKsRow++) {
+	                var ksRow = ksRows - invKsRow;
+
+	                if (invKsRow % 4) {
+	                    var t = keySchedule[ksRow];
+	                } else {
+	                    var t = keySchedule[ksRow - 4];
+	                }
+
+	                if (invKsRow < 4 || ksRow <= 4) {
+	                    invKeySchedule[invKsRow] = t;
+	                } else {
+	                    invKeySchedule[invKsRow] = INV_SUB_MIX_0[SBOX[t >>> 24]] ^ INV_SUB_MIX_1[SBOX[(t >>> 16) & 0xff]] ^
+	                                               INV_SUB_MIX_2[SBOX[(t >>> 8) & 0xff]] ^ INV_SUB_MIX_3[SBOX[t & 0xff]];
+	                }
+	            }
+	        },
+
+	        encryptBlock: function (M, offset) {
+	            this._doCryptBlock(M, offset, this._keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX);
+	        },
+
+	        decryptBlock: function (M, offset) {
+	            // Swap 2nd and 4th rows
+	            var t = M[offset + 1];
+	            M[offset + 1] = M[offset + 3];
+	            M[offset + 3] = t;
+
+	            this._doCryptBlock(M, offset, this._invKeySchedule, INV_SUB_MIX_0, INV_SUB_MIX_1, INV_SUB_MIX_2, INV_SUB_MIX_3, INV_SBOX);
+
+	            // Inv swap 2nd and 4th rows
+	            var t = M[offset + 1];
+	            M[offset + 1] = M[offset + 3];
+	            M[offset + 3] = t;
+	        },
+
+	        _doCryptBlock: function (M, offset, keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX) {
+	            // Shortcut
+	            var nRounds = this._nRounds;
+
+	            // Get input, add round key
+	            var s0 = M[offset]     ^ keySchedule[0];
+	            var s1 = M[offset + 1] ^ keySchedule[1];
+	            var s2 = M[offset + 2] ^ keySchedule[2];
+	            var s3 = M[offset + 3] ^ keySchedule[3];
+
+	            // Key schedule row counter
+	            var ksRow = 4;
+
+	            // Rounds
+	            for (var round = 1; round < nRounds; round++) {
+	                // Shift rows, sub bytes, mix columns, add round key
+	                var t0 = SUB_MIX_0[s0 >>> 24] ^ SUB_MIX_1[(s1 >>> 16) & 0xff] ^ SUB_MIX_2[(s2 >>> 8) & 0xff] ^ SUB_MIX_3[s3 & 0xff] ^ keySchedule[ksRow++];
+	                var t1 = SUB_MIX_0[s1 >>> 24] ^ SUB_MIX_1[(s2 >>> 16) & 0xff] ^ SUB_MIX_2[(s3 >>> 8) & 0xff] ^ SUB_MIX_3[s0 & 0xff] ^ keySchedule[ksRow++];
+	                var t2 = SUB_MIX_0[s2 >>> 24] ^ SUB_MIX_1[(s3 >>> 16) & 0xff] ^ SUB_MIX_2[(s0 >>> 8) & 0xff] ^ SUB_MIX_3[s1 & 0xff] ^ keySchedule[ksRow++];
+	                var t3 = SUB_MIX_0[s3 >>> 24] ^ SUB_MIX_1[(s0 >>> 16) & 0xff] ^ SUB_MIX_2[(s1 >>> 8) & 0xff] ^ SUB_MIX_3[s2 & 0xff] ^ keySchedule[ksRow++];
+
+	                // Update state
+	                s0 = t0;
+	                s1 = t1;
+	                s2 = t2;
+	                s3 = t3;
+	            }
+
+	            // Shift rows, sub bytes, add round key
+	            var t0 = ((SBOX[s0 >>> 24] << 24) | (SBOX[(s1 >>> 16) & 0xff] << 16) | (SBOX[(s2 >>> 8) & 0xff] << 8) | SBOX[s3 & 0xff]) ^ keySchedule[ksRow++];
+	            var t1 = ((SBOX[s1 >>> 24] << 24) | (SBOX[(s2 >>> 16) & 0xff] << 16) | (SBOX[(s3 >>> 8) & 0xff] << 8) | SBOX[s0 & 0xff]) ^ keySchedule[ksRow++];
+	            var t2 = ((SBOX[s2 >>> 24] << 24) | (SBOX[(s3 >>> 16) & 0xff] << 16) | (SBOX[(s0 >>> 8) & 0xff] << 8) | SBOX[s1 & 0xff]) ^ keySchedule[ksRow++];
+	            var t3 = ((SBOX[s3 >>> 24] << 24) | (SBOX[(s0 >>> 16) & 0xff] << 16) | (SBOX[(s1 >>> 8) & 0xff] << 8) | SBOX[s2 & 0xff]) ^ keySchedule[ksRow++];
+
+	            // Set output
+	            M[offset]     = t0;
+	            M[offset + 1] = t1;
+	            M[offset + 2] = t2;
+	            M[offset + 3] = t3;
+	        },
+
+	        keySize: 256/32
+	    });
+
+	    /**
+	     * Shortcut functions to the cipher's object interface.
+	     *
+	     * @example
+	     *
+	     *     var ciphertext = CryptoJS.AES.encrypt(message, key, cfg);
+	     *     var plaintext  = CryptoJS.AES.decrypt(ciphertext, key, cfg);
+	     */
+	    C.AES = BlockCipher._createHelper(AES);
+	}());
+
+
+	return CryptoJS.AES;
+
+}));

package/www/lib/js/crypto-js/bower.json

@@ -0,0 +1,39 @@
+{
+  "name": "crypto-js",
+  "version": "4.1.1",
+  "description": "JavaScript library of crypto standards.",
+  "license": "MIT",
+  "homepage": "http://github.com/brix/crypto-js",
+  "repository": {
+    "type": "git",
+    "url": "http://github.com/brix/crypto-js.git"
+  },
+  "keywords": [
+    "security",
+    "crypto",
+    "Hash",
+    "MD5",
+    "SHA1",
+    "SHA-1",
+    "SHA256",
+    "SHA-256",
+    "RC4",
+    "Rabbit",
+    "AES",
+    "DES",
+    "PBKDF2",
+    "HMAC",
+    "OFB",
+    "CFB",
+    "CTR",
+    "CBC",
+    "Base64",
+    "Base64url"
+  ],
+  "main": "index.js",
+  "dependencies": {},
+  "browser": {
+    "crypto": false
+  },
+  "ignore": []
+}