mirror of
https://github.com/emn178/js-sha3.git
synced 2026-11-16 23:08:50 +08:00
### Fixed
- Unpaired UTF-16 surrogates in string input produced wrong digests and consumed the following code unit. They are now encoded as U+FFFD, matching `TextEncoder` and Node.js `crypto` (also applies to cSHAKE/KMAC function names, customization strings, and keys, TupleHash, and ParallelHash) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
054f47e636
commit
290d679fbd
Vendored
+2
-2
File diff suppressed because one or more lines are too long
+2
-2
File diff suppressed because one or more lines are too long
+28
-10
@@ -9,7 +9,7 @@ var sha3$1 = {exports: {}};
|
||||
/**
|
||||
* [js-sha3]{@link https://github.com/emn178/js-sha3}
|
||||
*
|
||||
* @version 0.14.0
|
||||
* @version 0.15.0
|
||||
* @author Chen, Yi-Cyuan [emn178@gmail.com]
|
||||
* @copyright Chen, Yi-Cyuan 2015-2026
|
||||
* @license MIT
|
||||
@@ -308,7 +308,7 @@ var sha3$1 = {exports: {}};
|
||||
message = result[0];
|
||||
var isString = result[1];
|
||||
var blocks = this.blocks, byteCount = this.byteCount, length = message.length,
|
||||
blockCount = this.blockCount, index = 0, s = this.s, i, code;
|
||||
blockCount = this.blockCount, index = 0, s = this.s, i, code, code2;
|
||||
|
||||
while (index < length) {
|
||||
if (this.reset) {
|
||||
@@ -330,12 +330,18 @@ var sha3$1 = {exports: {}};
|
||||
blocks[i >> 2] |= (0xe0 | (code >> 12)) << SHIFT[i++ & 3];
|
||||
blocks[i >> 2] |= (0x80 | ((code >> 6) & 0x3f)) << SHIFT[i++ & 3];
|
||||
blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
|
||||
} else {
|
||||
code = 0x10000 + (((code & 0x3ff) << 10) | (message.charCodeAt(++index) & 0x3ff));
|
||||
} else if (code < 0xdc00 && (code2 = message.charCodeAt(index + 1)) >= 0xdc00 && code2 < 0xe000) {
|
||||
++index;
|
||||
code = 0x10000 + (((code & 0x3ff) << 10) | (code2 & 0x3ff));
|
||||
blocks[i >> 2] |= (0xf0 | (code >> 18)) << SHIFT[i++ & 3];
|
||||
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 {
|
||||
// unpaired surrogate: U+FFFD
|
||||
blocks[i >> 2] |= 0xef << SHIFT[i++ & 3];
|
||||
blocks[i >> 2] |= 0xbf << SHIFT[i++ & 3];
|
||||
blocks[i >> 2] |= 0xbd << SHIFT[i++ & 3];
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@@ -393,9 +399,12 @@ var sha3$1 = {exports: {}};
|
||||
bytes += 2;
|
||||
} else if (code < 0xd800 || code >= 0xe000) {
|
||||
bytes += 3;
|
||||
} else {
|
||||
code = 0x10000 + (((code & 0x3ff) << 10) | (str.charCodeAt(++i) & 0x3ff));
|
||||
} else if (code < 0xdc00 && (code = str.charCodeAt(i + 1)) >= 0xdc00 && code < 0xe000) {
|
||||
++i;
|
||||
bytes += 4;
|
||||
} else {
|
||||
// unpaired surrogate: U+FFFD
|
||||
bytes += 3;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@@ -573,9 +582,12 @@ var sha3$1 = {exports: {}};
|
||||
bytes += 2;
|
||||
} else if (code < 0xd800 || code >= 0xe000) {
|
||||
bytes += 3;
|
||||
} else {
|
||||
} else if (code < 0xdc00 && (code = message.charCodeAt(i + 1)) >= 0xdc00 && code < 0xe000) {
|
||||
++i;
|
||||
bytes += 4;
|
||||
} else {
|
||||
// unpaired surrogate: U+FFFD
|
||||
bytes += 3;
|
||||
}
|
||||
}
|
||||
return bytes;
|
||||
@@ -681,7 +693,7 @@ var sha3$1 = {exports: {}};
|
||||
var result = formatMessage(message);
|
||||
message = result[0];
|
||||
if (result[1]) {
|
||||
var bytes = [], length = message.length, index = 0, code, i;
|
||||
var bytes = [], length = message.length, index = 0, code, code2, i;
|
||||
for (i = 0; i < length; ++i) {
|
||||
code = message.charCodeAt(i);
|
||||
if (code < 0x80) {
|
||||
@@ -693,12 +705,18 @@ var sha3$1 = {exports: {}};
|
||||
bytes[index++] = (0xe0 | (code >>> 12));
|
||||
bytes[index++] = (0x80 | ((code >>> 6) & 0x3f));
|
||||
bytes[index++] = (0x80 | (code & 0x3f));
|
||||
} else {
|
||||
code = 0x10000 + (((code & 0x3ff) << 10) | (message.charCodeAt(++i) & 0x3ff));
|
||||
} else if (code < 0xdc00 && (code2 = message.charCodeAt(i + 1)) >= 0xdc00 && code2 < 0xe000) {
|
||||
++i;
|
||||
code = 0x10000 + (((code & 0x3ff) << 10) | (code2 & 0x3ff));
|
||||
bytes[index++] = (0xf0 | (code >>> 18));
|
||||
bytes[index++] = (0x80 | ((code >>> 12) & 0x3f));
|
||||
bytes[index++] = (0x80 | ((code >>> 6) & 0x3f));
|
||||
bytes[index++] = (0x80 | (code & 0x3f));
|
||||
} else {
|
||||
// unpaired surrogate: U+FFFD
|
||||
bytes[index++] = 0xef;
|
||||
bytes[index++] = 0xbf;
|
||||
bytes[index++] = 0xbd;
|
||||
}
|
||||
}
|
||||
message = bytes;
|
||||
|
||||
Reference in New Issue
Block a user