added keySize and maxMessageSize properties

fixed tests

Author: rzcoder

src/NodeRSA.js

@@ -47,6 +47,10 @@ module.exports = (function() {
         bits = bits || 2048;
         exp = 65537;
 
+        if (bits % 2 == 1) {
+            throw Error('Key size must be even.')
+        }
+
         this.keyPair.generate(bits, exp.toString(16));
         this.$recalculateCache();
         return this;
@@ -235,6 +239,14 @@ module.exports = (function() {
         return this.$cache.publicPEM;
     };
 
+    NodeRSA.prototype.getKeySize = function () {
+        return this.keyPair.keySize;
+    };
+
+    NodeRSA.prototype.getMaxMessageSize = function () {
+        return this.keyPair.maxMessageLength;
+    };
+
     /**
      * Preparing given data for encrypting/signing. Just make new/return Buffer object.
      *

src/libs/rsa.js

@@ -303,6 +303,10 @@ module.exports.Key = (function() {
         return m.toBuffer().toString('hex') == hash.toString('hex');
     };
 
+    Object.defineProperty(RSAKey.prototype, 'keySize', {
+        get: function() { return this.cache.keyBitLength; }
+    });
+
     Object.defineProperty(RSAKey.prototype, 'encryptedDataLength', {
         get: function() { return this.cache.keyByteLength; }
     });
@@ -318,6 +322,10 @@ module.exports.Key = (function() {
         this.cache = this.cache || {};
         // Bit & byte length
         this.cache.keyBitLength = this.n.bitLength();
+        if (this.cache.keyBitLength % 2 == 1) {
+            this.cache.keyBitLength = this.cache.keyBitLength + 1;
+        }
+
         this.cache.keyByteLength = (this.cache.keyBitLength + 6) >> 3;
     };
 

test/tests.js

@@ -58,11 +58,15 @@ describe("NodeRSA", function(){
     describe("Work with keys", function(){
 
         describe("Generating keys", function() {
-            for (var i in keySizes) {
-                it("should make key pair " + keySizes[i].b + "-bit length and public exponent is " + (keySizes[i].e || 65537), function () {
-                    generatedKeys.push(new NodeRSA({b: keySizes[i].b, e: keySizes[i].e}));
-                    assert.instanceOf(generatedKeys[generatedKeys.length - 1].keyPair, Object);
-                });
+            for (var size in keySizes) {
+                (function(size){
+                    it("should make key pair " + size.b + "-bit length and public exponent is " + (size.e || 65537), function () {
+                        generatedKeys.push(new NodeRSA({b: size.b, e: size.e}));
+                        assert.instanceOf(generatedKeys[generatedKeys.length - 1].keyPair, Object);
+                        assert.equal(generatedKeys[generatedKeys.length - 1].getKeySize(), size.b);
+                        assert.equal(generatedKeys[generatedKeys.length - 1].getMaxMessageSize(), (size.b / 8 - 11));
+                    });
+                })(keySizes[size]);
             }
         });