Merge pull request #25 from MythicalBeings/master

FIX: Decrypt (wordArrayToByteArray) and compatibility
mrv777 · Feb 23, 2023 · f5a1640 · f5a1640
2 parents dfd6df9 + 08e50bf
commit f5a1640
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/account.js b/lib/account.js
@@ -6,6 +6,7 @@ import BigInteger from "jsbn";
 import * as pako from "pako";
 import cryptoJs from "crypto-js";
 import hex from "crypto-js/enc-hex";
+import { Buffer } from "buffer";
 
 function rsConvert(address) {
   var addr = new NxtAddress();

diff --git a/lib/helpers.js b/lib/helpers.js
@@ -1,6 +1,7 @@
 import cryptoJs from "crypto-js";
 import hex from "crypto-js/enc-hex";
 import { BigInteger } from "jsbn";
+import { Buffer } from "buffer";
 
 var charToNibble = {};
 var nibbleToChar = [];
@@ -205,7 +206,7 @@ function wordArrayToByteArray(wordArray, isFirstByteHasSign) {
   if (len == 0) {
     return new Array(0);
   }
-  var byteArray = new Array(wordArray.sigBytes);
+  var byteArray = new Array(len * 4);
   var offset = 0;
   var word;
   var i;
@@ -229,7 +230,8 @@ function wordArrayToByteArray(wordArray, isFirstByteHasSign) {
   if (wordArray.sigBytes % 4 > 2) {
     byteArray[offset++] = (word >> 8) & 0xff;
   }
-  return byteArray;
+
+  return byteArray.slice(0, wordArray.sigBytes);
 }
 
 function byteArrayToShortArray(byteArray) {