Skip to content

Fix issues 2139, 2217 handling Auto delimiter in fromDecimal function #2650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alleria173 wants to merge 2 commits into from
+43 −5
Closed

Fix issues 2139, 2217 handling Auto delimiter in fromDecimal function #2650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
387c367
Fix issues 2139, 2217 handling Auto delimiter in fromDecimal function…
alleria173 Jul 7, 2026
fc85198
Merge branch 'master' into fix/auto-delimiter-in-fromDecimal-function…
alleria173 Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/core/lib/Decimal.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,17 @@ import Utils from "../Utils.mjs";
* fromDecimal("10:20:30", "Colon");
*/
export function fromDecimal(data, delim="Auto") {
delim = Utils.charRep(delim);
const output = [];
let byteStr = data.split(delim);
if (byteStr[byteStr.length-1] === "")
byteStr = byteStr.slice(0, byteStr.length-1);
let byteStr;
if (delim === "Auto") {
byteStr = data.split(/[^\d-]+/).filter(v => v !== "");
} else {
const delimStr = Utils.charRep(delim);
byteStr = data.split(delimStr);
if (byteStr[byteStr.length-1] === "")
byteStr = byteStr.slice(0, byteStr.length-1);
}

const output = [];
for (let i = 0; i < byteStr.length; i++) {
output[i] = parseInt(byteStr[i], 10);
}
Expand Down
33 changes: 33 additions & 0 deletions tests/operations/tests/Hash.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,39 @@ TestRegister.addTests([
}
]
},
{
name: "HMAC: Decimal key space-delimited matches Latin1 key (fromDecimal Auto delimiter regression)",
input: "Hello, World!",
expectedOutput: "9b641a008211bb0464a10899d5b37a24ab08ffcf839f5e74d17d99f856530957",
recipeConfig: [
{
"op": "HMAC",
"args": [{"option": "Decimal", "string": "65 65"}, "SHA256"]
}
]
},
{
name: "HMAC: Latin1 key matches space-delimited Decimal key (fromDecimal Auto delimiter regression)",
input: "Hello, World!",
expectedOutput: "9b641a008211bb0464a10899d5b37a24ab08ffcf839f5e74d17d99f856530957",
recipeConfig: [
{
"op": "HMAC",
"args": [{"option": "Latin1", "string": "AA"}, "SHA256"]
}
]
},
{
name: "HMAC: Decimal key comma-delimited matches Latin1 key (fromDecimal Auto delimiter regression)",
input: "Hello, World!",
expectedOutput: "9b641a008211bb0464a10899d5b37a24ab08ffcf839f5e74d17d99f856530957",
recipeConfig: [
{
"op": "HMAC",
"args": [{"option": "Decimal", "string": "65,65"}, "SHA256"]
}
]
},
{
name: "MD5: Complex bytes",
input: "10dc10e32010de10d010dc10d810d910d010e12e",
Expand Down