Merge pull request #583 from davedoesdev/master

Fix OAEP padding #582
kjur · Apr 15, 2023 · d332357 · d332357
2 parents 9671f4b + 1cfd939
commit d332357
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/ext/rsa.js b/ext/rsa.js
@@ -186,12 +186,14 @@ function RSAEncrypt(text) {
 
 // Return the PKCS#1 OAEP RSA encryption of "text" as an even-length hex string
 function RSAEncryptOAEP(text, hash, hashLen) {
-  var m = oaep_pad(text, (this.n.bitLength() + 7) >> 3, hash, hashLen);
+  var n = (this.n.bitLength() + 7) >> 3;
+  var m = oaep_pad(text, n, hash, hashLen);
   if(m == null) return null;
   var c = this.doPublic(m);
   if(c == null) return null;
   var h = c.toString(16);
-  if((h.length & 1) == 0) return h; else return "0" + h;
+  while (h.length < n*2) h = "0" + h;
+  return h;
 }
 
 // Return the PKCS#1 RSA encryption of "text" as a Base64-encoded string