WebSVN – oidplus – Diff – /trunk/vendor/emn178/js-sha3/src/sha3.js

 /**
  * [js-sha3]{@link https://github.com/emn178/js-sha3}
+ *
- * @version 0.9.0
+ * @version 0.9.2
  * @author Chen, Yi-Cyuan [emn178@gmail.com]
  * @copyright Chen, Yi-Cyuan 2015-2023
  * @license MIT
  */
 /*jslint bitwise: true */
   var CSHAKE_BYTEPAD = {
     '128': 168,
     '256': 136
   };
-  if (root.JS_SHA3_NO_NODE_JS || !Array.isArray) {
+  var isArray = root.JS_SHA3_NO_NODE_JS || !Array.isArray
-    Array.isArray = function (obj) {
+    ? function (obj) {
-      return Object.prototype.toString.call(obj) === '[object Array]';
+        return Object.prototype.toString.call(obj) === '[object Array]';
-    };
+      }
+    : Array.isArray;
-  if (ARRAY_BUFFER && (root.JS_SHA3_NO_ARRAY_BUFFER_IS_VIEW || !ArrayBuffer.isView)) {
+  var isView = (ARRAY_BUFFER && (root.JS_SHA3_NO_ARRAY_BUFFER_IS_VIEW || !ArrayBuffer.isView))
-    ArrayBuffer.isView = function (obj) {
+    ? function (obj) {
-      return typeof obj === 'object' && obj.buffer && obj.buffer.constructor === ArrayBuffer;
+        return typeof obj === 'object' && obj.buffer && obj.buffer.constructor === ArrayBuffer;
+      }
+    : ArrayBuffer.isView;
+  // [message: string, isString: bool]
+  var formatMessage = function (message) {
+    var type = typeof message;
+    if (type === 'string') {
+      return [message, true];
-    };
+    }
+    if (type !== 'object' || message === null) {
+      throw new Error(INPUT_ERROR);
+    }
+    if (ARRAY_BUFFER && message.constructor === ArrayBuffer) {
+      return [new Uint8Array(message), false];
+    }
+    if (!isArray(message) && !isView(message)) {
+      throw new Error(INPUT_ERROR);
+    }
+    return [message, false];
+  }
+  var empty = function (message) {
+    return formatMessage(message)[0].length === 0;
+  };
   var createOutputMethod = function (bits, padding, outputType) {
     return function (message) {
       return new Keccak(bits, padding, bits).update(message)[outputType]();
     };
   };
   var createCshakeMethod = function (bits, padding) {
     var w = CSHAKE_BYTEPAD[bits];
     var method = createCshakeOutputMethod(bits, padding, 'hex');
     method.create = function (outputBits, n, s) {
-      if (!n && !s) {
+      if (empty(n) && empty(s)) {
         return methods['shake' + bits].create(outputBits);
       } else {
         return new Keccak(bits, padding, outputBits).bytepad([n, s], w);
+      }
     };
   Keccak.prototype.update = function (message) {
     if (this.finalized) {
       throw new Error(FINALIZE_ERROR);
+    }
-    var notString, type = typeof message;
+    var result = formatMessage(message);
-    if (type !== 'string') {
-      if (type === 'object') {
-        if (message === null) {
+    message = result[0];
-          throw new Error(INPUT_ERROR);
-        } else if (ARRAY_BUFFER && message.constructor === ArrayBuffer) {
-          message = new Uint8Array(message);
-        } else if (!Array.isArray(message)) {
-          if (!ARRAY_BUFFER || !ArrayBuffer.isView(message)) {
-            throw new Error(INPUT_ERROR);
-          }
-        }
-      } else {
-        throw new Error(INPUT_ERROR);
-      }
-      notString = true;
+    var isString = result[1];
-    }
     var blocks = this.blocks, byteCount = this.byteCount, length = message.length,
       blockCount = this.blockCount, index = 0, s = this.s, i, code;
     while (index < length) {
       if (this.reset) {
         blocks[0] = this.block;
         for (i = 1; i < blockCount + 1; ++i) {
           blocks[i] = 0;
+        }
+      }
-      if (notString) {
+      if (isString) {
-        for (i = this.start; index < length && i < byteCount; ++index) {
-          blocks[i >> 2] |= message[index] << SHIFT[i++ & 3];
-        }
-      } else {
         for (i = this.start; index < length && i < byteCount; ++index) {
           code = message.charCodeAt(index);
           if (code < 0x80) {
             blocks[i >> 2] |= code << SHIFT[i++ & 3];
           } else if (code < 0x800) {
             blocks[i >> 2] |= (0x80 | ((code >> 12) & 0x3f)) << SHIFT[i++ & 3];
             blocks[i >> 2] |= (0x80 | ((code >> 6) & 0x3f)) << SHIFT[i++ & 3];
             blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
+          }
+        }
+      } else {
+        for (i = this.start; index < length && i < byteCount; ++index) {
+          blocks[i >> 2] |= message[index] << SHIFT[i++ & 3];
+        }
+      }
       this.lastByteIndex = i;
       if (i >= byteCount) {
         this.start = i - byteCount;
         this.block = blocks[blockCount];
     this.update(bytes);
     return bytes.length;
   };
   Keccak.prototype.encodeString = function (str) {
-    var notString, type = typeof str;
-    if (type !== 'string') {
-      if (type === 'object') {
-        if (str === null) {
-          throw new Error(INPUT_ERROR);
-        } else if (ARRAY_BUFFER && str.constructor === ArrayBuffer) {
-          str = new Uint8Array(str);
+    var result = formatMessage(str);
-        } else if (!Array.isArray(str)) {
-          if (!ARRAY_BUFFER || !ArrayBuffer.isView(str)) {
-            throw new Error(INPUT_ERROR);
-          }
-        }
-      } else {
+    str = result[0];
-        throw new Error(INPUT_ERROR);
-      }
-      notString = true;
+    var isString = result[1];
-    }
     var bytes = 0, length = str.length;
-    if (notString) {
+    if (isString) {
-      bytes = length;
-    } else {
       for (var i = 0; i < str.length; ++i) {
         var code = str.charCodeAt(i);
         if (code < 0x80) {
           bytes += 1;
         } else if (code < 0x800) {
         } else {
           code = 0x10000 + (((code & 0x3ff) << 10) | (str.charCodeAt(++i) & 0x3ff));
           bytes += 4;
+        }
+      }
+    } else {
+      bytes = length;
+    }
     bytes += this.encode(bytes * 8);
     this.update(str);
     return bytes;
   };

Subversion Repositories oidplus

oidplus/trunk/vendor/emn178/js-sha3/src/sha3.js – Rev 1417 → 1419