Merge pull request kjur#303 from davedoesdev/master

Fix OAEP padding and unpadding
coolbnjmn · Mar 24, 2018 · b6ff004 · b6ff004
2 parents 54e10e9 + b90dc17
commit b6ff004
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/ext/rsa.js b/ext/rsa.js
@@ -104,9 +104,11 @@ function oaep_pad(s, n, hash, hashLen) {
     if (!hash) hash = "sha1";
 
     if (typeof hash === "string") {
-	algName = MD.getCanonicalAlgName(hash);
-	hashLen = MD.getHashLength(algName);
-        hash = function(s) { return hextorstr(Util.hashString(s, algName)); };
+        algName = MD.getCanonicalAlgName(hash);
+        hashLen = MD.getHashLength(algName);
+        hash = function(s) {
+            return hextorstr(Util.hashHex(rstrtohex(s), algName));
+        };
     }
 
     if (s.length + 2 * hashLen + 2 > n) {

diff --git a/ext/rsa2.js b/ext/rsa2.js
@@ -74,9 +74,11 @@ function oaep_unpad(d, n, hash, hashLen) {
     if (!hash) hash = "sha1";
 
     if (typeof hash === "string") {
-	algName = MD.getCanonicalAlgName(hash);
-	hashLen = MD.getHashLength(algName);
-        hash = function(s) { return hextorstr(Util.hashString(s, algName)); };
+        algName = MD.getCanonicalAlgName(hash);
+        hashLen = MD.getHashLength(algName);
+        hash = function(s) {
+            return hextorstr(Util.hashHex(rstrtohex(s), algName));
+        };
     }
 
     d = d.toByteArray();