fixed no padding on node env

fixed tests

Author: s.vychegzhanin

README.md

@@ -237,6 +237,9 @@ Questions, comments, bug reports, and pull requests are all welcome.
 
 ## Changelog
 
+### 0.4.2
+ * `no padding` scheme will padded data with zeros on all environments.
+ 
 ### 0.4.1
  * `PKCS1 no padding` scheme support.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-rsa",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Node.js RSA library",
   "main": "src/NodeRSA.js",
   "scripts": {

src/encryptEngines/io.js

@@ -1,7 +1,10 @@
 var crypto = require('crypto');
 var constants = require('constants');
+var schemes = require('../schemes/schemes.js');
 
 module.exports = function (keyPair, options) {
+    var pkcs1Scheme = schemes.pkcs1.makeScheme(keyPair, options);
+
     return {
         encrypt: function (buffer, usePrivate) {
             if (usePrivate) {
@@ -21,10 +24,16 @@ module.exports = function (keyPair, options) {
                 if (options.encryptionSchemeOptions && options.encryptionSchemeOptions.padding) {
                     padding = options.encryptionSchemeOptions.padding;
                 }
+
+                var data = buffer;
+                if (padding === constants.RSA_NO_PADDING) {
+                    data = pkcs1Scheme.pkcs0pad(buffer);
+                }
+
                 return crypto.publicEncrypt({
                     key: options.rsaUtils.exportKey('public'),
                     padding: padding
-                }, buffer);
+                }, data);
             }
         },
 
@@ -46,10 +55,15 @@ module.exports = function (keyPair, options) {
                 if (options.encryptionSchemeOptions && options.encryptionSchemeOptions.padding) {
                     padding = options.encryptionSchemeOptions.padding;
                 }
-                return crypto.privateDecrypt({
+                var res = crypto.privateDecrypt({
                     key: options.rsaUtils.exportKey('private'),
                     padding: padding
                 }, buffer);
+
+                if (padding === constants.RSA_NO_PADDING) {
+                    return pkcs1Scheme.pkcs0unpad(res);
+                }
+                return res;
             }
         }
     };

src/encryptEngines/node12.js

@@ -1,8 +1,10 @@
 var crypto = require('crypto');
 var constants = require('constants');
+var schemes = require('../schemes/schemes.js');
 
 module.exports = function (keyPair, options) {
     var jsEngine = require('./js.js')(keyPair, options);
+    var pkcs1Scheme = schemes.pkcs1.makeScheme(keyPair, options);
 
     return {
         encrypt: function (buffer, usePrivate) {
@@ -17,10 +19,15 @@ module.exports = function (keyPair, options) {
                 padding = options.encryptionSchemeOptions.padding;
             }
 
+            var data = buffer;
+            if (padding === constants.RSA_NO_PADDING) {
+                data = pkcs1Scheme.pkcs0pad(buffer);
+            }
+
             return crypto.publicEncrypt({
                 key: options.rsaUtils.exportKey('public'),
                 padding: padding
-            }, buffer);
+            }, data);
         },
 
         decrypt: function (buffer, usePublic) {
@@ -35,10 +42,15 @@ module.exports = function (keyPair, options) {
                 padding = options.encryptionSchemeOptions.padding;
             }
 
-            return crypto.privateDecrypt({
+            var res = crypto.privateDecrypt({
                 key: options.rsaUtils.exportKey('private'),
                 padding: padding
             }, buffer);
+
+            if (padding === constants.RSA_NO_PADDING) {
+                return pkcs1Scheme.pkcs0unpad(res);
+            }
+            return res;
         }
     };
 };

src/schemes/pkcs1.js

@@ -55,9 +55,7 @@ module.exports.makeScheme = function (key, options) {
         }
         if (this.options.encryptionSchemeOptions && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
             //RSA_NO_PADDING treated like JAVA left pad with zero character
-            filled = new Buffer(this.key.maxMessageLength - buffer.length);
-            filled.fill(0);
-            return Buffer.concat([filled, buffer]);
+            return this.pkcs0pad(buffer);
         }
 
         /* Type 1: zeros padding for private key encrypt */
@@ -98,13 +96,7 @@ module.exports.makeScheme = function (key, options) {
 
         if (this.options.encryptionSchemeOptions && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
             //RSA_NO_PADDING treated like JAVA left pad with zero character
-            var unPad;
-            if (typeof buffer.lastIndexOf == "function") { //patch for old node version
-                unPad = buffer.slice(buffer.lastIndexOf('\0') + 1, buffer.length);
-            } else {
-                unPad = buffer.slice(String.prototype.lastIndexOf.call(buffer, '\0') + 1, buffer.length);
-            }
-            return unPad;
+            return this.pkcs0unpad(buffer);
         }
 
         if (buffer.length < 4) {
@@ -181,6 +173,31 @@ module.exports.makeScheme = function (key, options) {
         }
     };
 
+    /**
+     * PKCS#1 zero pad input buffer to max data length
+     * @param hashBuf
+     * @param hashAlgorithm
+     * @returns {*}
+     */
+    Scheme.prototype.pkcs0pad = function (buffer) {
+        var filled = new Buffer(this.key.maxMessageLength - buffer.length);
+        filled.fill(0);
+        return Buffer.concat([filled, buffer]);
+
+        return filled;
+    };
+
+    Scheme.prototype.pkcs0unpad = function (buffer) {
+        var unPad;
+        if (typeof buffer.lastIndexOf == "function") { //patch for old node version
+            unPad = buffer.slice(buffer.lastIndexOf('\0') + 1, buffer.length);
+        } else {
+            unPad = buffer.slice(String.prototype.lastIndexOf.call(buffer, '\0') + 1, buffer.length);
+        }
+
+        return unPad;
+    };
+
     /**
      * PKCS#1 pad input buffer to max data length
      * @param hashBuf

test/tests.js

@@ -22,9 +22,7 @@ describe('NodeRSA', function () {
         'pkcs1_oaep',
         {
             scheme:'pkcs1',
-            encryptionScheme:{
-                padding: constants.RSA_NO_PADDING
-            },
+            padding: constants.RSA_NO_PADDING,
             toString: function() {
                 return 'pkcs1-nopadding';
             }
@@ -178,7 +176,7 @@ describe('NodeRSA', function () {
             }
         });
 
-        describe('Imprt/Export keys', function () {
+        describe('Import/Export keys', function () {
             var privateKeyPKCS1 = '-----BEGIN RSA PRIVATE KEY-----\n' +
                 'MIIFwgIBAAKCAUEAsE1edyfToZRv6cFOkB0tAJ5qJor4YF5CccJAL0fS/o1Yk10V\n' +
                 'SXH4Xx4peSJgYQKkO0HqO1hAz6k9dFQB4U1CnWtRjtNEcIfycqrZrhu6you5syb6\n' +