version bump

Author: rzcoder

README.md

@@ -236,6 +236,9 @@ Return result of check, `true` or `false`.<br/>
 Questions, comments, bug reports, and pull requests are all welcome.
 
 ## Changelog
+
+### 0.4.1
+ * `PKCS1 no padding` scheme support.
 
 ### 0.4.0
  * License changed from BSD to MIT. 

package.json

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

src/NodeRSA.js

@@ -7,6 +7,7 @@
  * License BSD
  */
 
+var constants = require('constants');
 var rsa = require('./libs/rsa.js');
 var crypt = require('crypto');
 var ber = require('asn1').Ber;
@@ -15,6 +16,11 @@ var utils = require('./utils');
 var schemes = require('./schemes/schemes.js');
 var formats = require('./formats/formats.js');
 
+if (typeof constants.RSA_NO_PADDING == "undefined") {
+    //patch for node v0.10.x, constants do not defined
+    constants.RSA_NO_PADDING = 3;
+}
+
 module.exports = (function () {
     var SUPPORTED_HASH_ALGORITHMS = {
         node10: ['md4', 'md5', 'ripemd160', 'sha', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512'],

src/encryptEngines/io.js

@@ -2,8 +2,6 @@ var crypto = require('crypto');
 var constants = require('constants');
 
 module.exports = function (keyPair, options) {
-    var jsEngine = require('./js.js')(keyPair, options);
-
     return {
         encrypt: function (buffer, usePrivate) {
             if (usePrivate) {

src/schemes/pkcs1.js

@@ -5,7 +5,6 @@
 var BigInteger = require('../libs/jsbn');
 var crypt = require('crypto');
 var constants = require('constants');
-var _ = require('lodash');
 var SIGN_INFO_HEAD = {
     md2: new Buffer('3020300c06082a864886f70d020205000410', 'hex'),
     md5: new Buffer('3020300c06082a864886f70d020505000410', 'hex'),
@@ -24,11 +23,6 @@ var SIGN_ALG_TO_HASH_ALIASES = {
 
 var DEFAULT_HASH_FUNCTION = 'sha256';
 
-if (typeof constants.RSA_NO_PADDING == "undefined") {
-    //patch for node v0.10.x, constants do not defined
-    constants.RSA_NO_PADDING = 3;
-}
-
 module.exports = {
     isEncryption: true,
     isSignature: true
@@ -41,7 +35,7 @@ module.exports.makeScheme = function (key, options) {
     }
 
     Scheme.prototype.maxMessageLength = function () {
-        if (!_.isEmpty(this.options.encryptionSchemeOptions) && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
+        if (this.options.encryptionSchemeOptions && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
             return this.key.encryptedDataLength;
         }
         return this.key.encryptedDataLength - 11;
@@ -59,7 +53,7 @@ module.exports.makeScheme = function (key, options) {
         if (buffer.length > this.key.maxMessageLength) {
             throw new Error("Message too long for RSA (n=" + this.key.encryptedDataLength + ", l=" + buffer.length + ")");
         }
-        if (!_.isEmpty(this.options.encryptionSchemeOptions) && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
+        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);
@@ -102,7 +96,7 @@ module.exports.makeScheme = function (key, options) {
         options = options || {};
         var i = 0;
 
-        if (!_.isEmpty(this.options.encryptionSchemeOptions) && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
+        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
@@ -164,7 +158,7 @@ module.exports.makeScheme = function (key, options) {
     Scheme.prototype.verify = function (buffer, signature, signature_encoding) {
         if (this.options.encryptionSchemeOptions && this.options.encryptionSchemeOptions.padding == constants.RSA_NO_PADDING) {
             //RSA_NO_PADDING has no verify data
-            return true;
+            return false;
         }
         var hashAlgorithm = this.options.signingSchemeOptions.hash || DEFAULT_HASH_FUNCTION;
         if (this.options.environment === 'browser') {

test/tests.js

@@ -17,7 +17,19 @@ describe('NodeRSA', function () {
     ];
 
     var environments = ['browser', 'node'];
-    var encryptSchemes = ['pkcs1', 'pkcs1_oaep', {scheme:'pkcs1', encryptionScheme:{padding: constants.RSA_NO_PADDING}}];
+    var encryptSchemes = [
+        'pkcs1',
+        'pkcs1_oaep',
+        {
+            scheme:'pkcs1',
+            encryptionScheme:{
+                padding: constants.RSA_NO_PADDING
+            },
+            toString: function() {
+                return 'pkcs1-nopadding';
+            }
+        }
+        ];
     var signingSchemes = ['pkcs1', 'pss'];
     var signHashAlgorithms = {
         'node': ['MD4', 'MD5', 'RIPEMD160', 'SHA', 'SHA1', 'SHA224', 'SHA256', 'SHA384', 'SHA512'],
@@ -117,8 +129,7 @@ describe('NodeRSA', function () {
                 encryptionScheme: {
                     scheme: 'pkcs1_oaep',
                     hash: 'sha512',
-                    label: 'horay',
-                    padding: constants.RSA_NO_PADDING
+                    label: 'horay'
                 },
                 signingScheme: {
                     scheme: 'pss',
@@ -133,7 +144,6 @@ describe('NodeRSA', function () {
             assert.equal(key.$options.encryptionScheme, 'pkcs1_oaep');
             assert.equal(key.$options.encryptionSchemeOptions.hash, 'sha512');
             assert.equal(key.$options.encryptionSchemeOptions.label, 'horay');
-            assert.equal(key.$options.encryptionSchemeOptions.padding, constants.RSA_NO_PADDING);
         });
 
         it('should throw \'unsupported hashing algorithm\' exception', function () {