node-firebird 2.0.2 → 2.3.0

package/lib/srp.js

@@ -1,20 +1,19 @@
-var BigInt = require('big-integer'),
-    crypto = require('crypto');
+var crypto = require('crypto');
 
 const SRP_KEY_SIZE = 128,
   SRP_KEY_MAX = BigInt('340282366920938463463374607431768211456'), // 1 << SRP_KEY_SIZE
   SRP_SALT_SIZE = 32;
 
 const DEBUG = false;
-const DEBUG_PRIVATE_KEY = BigInt('84316857F47914F838918D5C12CE3A3E7A9B2D7C9486346809E9EEFCE8DE7CD4259D8BE4FD0BCC2D259553769E078FA61EE2977025E4DA42F7FD97914D8A33723DFAFBC00770B7DA0C2E3778A05790F0C0F33C32A19ED88A12928567749021B3FD45DCD1CE259C45325067E3DDC972F87867349BA82C303CCCAA9B207218007B', 16);
+const DEBUG_PRIVATE_KEY = BigInt('0x84316857F47914F838918D5C12CE3A3E7A9B2D7C9486346809E9EEFCE8DE7CD4259D8BE4FD0BCC2D259553769E078FA61EE2977025E4DA42F7FD97914D8A33723DFAFBC00770B7DA0C2E3778A05790F0C0F33C32A19ED88A12928567749021B3FD45DCD1CE259C45325067E3DDC972F87867349BA82C303CCCAA9B207218007B');
 
 /**
  * Prime values.
  *
- * @type {{g: (bigInt.BigInteger), k: (bigInt.BigInteger), N: (bigInt.BigInteger)}}
+ * @type {{g: BigInt, k: BigInt, N: BigInt}}
  */
 const PRIME = {
-    N: BigInt('E67D2E994B2F900C3F41F08F5BB2627ED0D49EE1FE767A52EFCD565CD6E768812C3E1E9CE8F0A8BEA6CB13CD29DDEBF7A96D4A93B55D488DF099A15C89DCB0640738EB2CBDD9A8F7BAB561AB1B0DC1C6CDABF303264A08D1BCA932D1F1EE428B619D970F342ABA9A65793B8B2F041AE5364350C16F735F56ECBCA87BD57B29E7', 16),
+    N: BigInt('0xE67D2E994B2F900C3F41F08F5BB2627ED0D49EE1FE767A52EFCD565CD6E768812C3E1E9CE8F0A8BEA6CB13CD29DDEBF7A96D4A93B55D488DF099A15C89DCB0640738EB2CBDD9A8F7BAB561AB1B0DC1C6CDABF303264A08D1BCA932D1F1EE428B619D970F342ABA9A65793B8B2F041AE5364350C16F735F56ECBCA87BD57B29E7'),
     g: BigInt(2),
     k: BigInt('1277432915985975349439481660349303019122249719989')
 };
@@ -22,11 +21,11 @@ const PRIME = {
 /**
  * Generate a client key pair.
  *
- * @param a bigInt.BigInteger Client private key.
- * @returns {{private: bigInt.BigInteger, public: bigInt.BigInteger}}
+ * @param a BigInt Client private key.
+ * @returns {{private: BigInt, public: BigInt}}
  */
 exports.clientSeed = function(a = toBigInt(crypto.randomBytes(SRP_KEY_SIZE))) {
-    var A = PRIME.g.modPow(a, PRIME.N);
+    var A = modPow(PRIME.g, a, PRIME.N);
 
     dump('a', a);
     dump('A', A);
@@ -42,15 +41,15 @@ exports.clientSeed = function(a = toBigInt(crypto.randomBytes(SRP_KEY_SIZE))) {
  *
  * @param user string Connection username.
  * @param password string Connection password.
- * @param salt bigInt.BigInteger Connection salt.
- * @param b bigInt.BigInteger Server private key.
- * @returns {{private: bigInt.BigInteger, public: bigInt.BigInteger}}
+ * @param salt BigInt Connection salt.
+ * @param b BigInt Server private key.
+ * @returns {{private: BigInt, public: BigInt}}
  */
 exports.serverSeed = function(user, password, salt, b = toBigInt(crypto.randomBytes(SRP_KEY_SIZE))) {
     var v = getVerifier(user, password, salt);
-    var gb = PRIME.g.modPow(b, PRIME.N);
-    var kv = PRIME.k.multiply(v).mod(PRIME.N);
-    var B = kv.add(gb).mod(PRIME.N);
+    var gb = modPow(PRIME.g, b, PRIME.N);
+    var kv = (PRIME.k * v) % PRIME.N;
+    var B = (kv + gb) % PRIME.N;
 
     dump('v', v);
     dump('b', b);
@@ -69,24 +68,24 @@ exports.serverSeed = function(user, password, salt, b = toBigInt(crypto.randomBy
  *
  * @param user string Connection username.
  * @param password string Connection password.
- * @param salt bigInt.BigInteger Connection salt.
- * @param A bigInt.BigInteger Client public key.
- * @param B bigInt.BigInteger Server public key.
- * @param b bigInt.BigInteger Server private key.
- * @returns {bigInt.BigInteger}
+ * @param salt BigInt Connection salt.
+ * @param A BigInt Client public key.
+ * @param B BigInt Server public key.
+ * @param b BigInt Server private key.
+ * @returns {BigInt}
  */
 exports.serverSession = function(user, password, salt, A, B, b) {
     var u = getScramble(A, B);
     var v = getVerifier(user, password, salt);
-    var vu = v.modPow(u, PRIME.N);
-    var Avu = A.multiply(vu).mod(PRIME.N);
-    var sessionSecret = Avu.modPow(b, PRIME.N);
+    var vu = modPow(v, u, PRIME.N);
+    var Avu = (A * vu) % PRIME.N;
+    var sessionSecret = modPow(Avu, b, PRIME.N);
     var K = getHash('sha1', toBuffer(sessionSecret));
 
     dump('server sessionSecret', sessionSecret);
     dump('server K', K);
 
-    return BigInt(K, 16);
+    return BigInt('0x' + K);
 };
 
 /**
@@ -102,7 +101,7 @@ exports.clientProof = function(user, password, salt, A, B, a, hashAlgo) {
     dump('n1', n1);
     dump('n2', n2);
 
-    n1 = n1.modPow(n2, PRIME.N);
+    n1 = modPow(n1, n2, PRIME.N);
     n2 = toBigInt(getHash('sha1', user));
     var M = toBigInt(getHash(hashAlgo, toBuffer(n1), toBuffer(n2), salt, toBuffer(A), toBuffer(B), toBuffer(K)));
 
@@ -147,12 +146,12 @@ function pad(n) {
 /**
  * Scramble keys.
  *
- * @param A bigInt.BigInteger Client public key.
- * @param B bigInt.BigInteger Server public key.
- * @returns {bigInt.BigInteger}
+ * @param A BigInt Client public key.
+ * @param B BigInt Server public key.
+ * @returns {BigInt}
  */
 function getScramble(A, B) {
-    return BigInt(getHash('sha1', pad(A), pad(B)), 16);
+    return BigInt('0x' + getHash('sha1', pad(A), pad(B)));
 }
 
 /**
@@ -165,28 +164,28 @@ function getScramble(A, B) {
  *
  * @param user string Connection username.
  * @param password string Connection password.
- * @param salt bigInt.BigInteger Connection salt.
- * @param A bigInt.BigInteger Client public key.
- * @param B bigInt.BigInteger Server public key.
- * @param a bigInt.BigInteger Client private key.
+ * @param salt BigInt Connection salt.
+ * @param A BigInt Client public key.
+ * @param B BigInt Server public key.
+ * @param a BigInt Client private key.
  */
 function clientSession(user, password, salt, A, B, a) {
     var u = getScramble(A, B);
     var x = getUserHash(user, salt, password);
-    var gx = PRIME.g.modPow(x, PRIME.N);
-    var kgx = PRIME.k.multiply(gx).mod(PRIME.N);
-    var diff = B.subtract(kgx).mod(PRIME.N);
+    var gx = modPow(PRIME.g, x, PRIME.N);
+    var kgx = (PRIME.k * gx) % PRIME.N;
+    var diff = (B - kgx) % PRIME.N;
 
-    if (diff.lesser(0)) {
-        diff = diff.add(PRIME.N);
+    if (diff < 0n) {
+        diff = diff + PRIME.N;
     }
 
     // Note: While the SRP specification says exponents should not be reduced mod N,
     // the Firebird engine implementation does reduce these exponents mod N.
     // We must match the server's behavior for authentication to succeed.
-    var ux = u.multiply(x).mod(PRIME.N);
-    var aux = a.add(ux).mod(PRIME.N);
-    var sessionSecret = diff.modPow(aux, PRIME.N);
+    var ux = (u * x) % PRIME.N;
+    var aux = (a + ux) % PRIME.N;
+    var sessionSecret = modPow(diff, aux, PRIME.N);
     var K = toBigInt(getHash('sha1', toBuffer(sessionSecret)));
 
     dump('B', B);
@@ -207,9 +206,9 @@ function clientSession(user, password, salt, A, B, a) {
  * Compute user hash.
  *
  * @param user string Connection username.
- * @param salt bigInt.BigInteger Connection salt.
+ * @param salt BigInt Connection salt.
  * @param password string Connection password.
- * @returns {bigInt.BigInteger}
+ * @returns {BigInt}
  */
 function getUserHash(user, salt, password) {
     var hash1 = getHash('sha1', user.toUpperCase(), ':', password);
@@ -223,11 +222,11 @@ function getUserHash(user, salt, password) {
  *
  * @param user string Connection username.
  * @param password string Connection password.
- * @param salt  bigInt.BigInteger Connection salt.
- * @returns {bigInt.BigInteger}
+ * @param salt  BigInt Connection salt.
+ * @returns {BigInt}
  */
 function getVerifier(user, password, salt) {
-    return PRIME.g.modPow(getUserHash(user, salt, password), PRIME.N);
+    return modPow(PRIME.g, getUserHash(user, salt, password), PRIME.N);
 }
 
 /**
@@ -254,17 +253,17 @@ function getHash(algo, ...data) {
  * @returns {*}
  */
 function toBuffer(bigInt) {
-    return Buffer.from(BigInt.isInstance(bigInt) ? hexPad(bigInt.toString(16)) : bigInt, 'hex');
+    return Buffer.from(typeof bigInt === 'bigint' ? hexPad(bigInt.toString(16)) : bigInt, 'hex');
 }
 
 /**
  * Convert hex buffer or string to BigInt.
  *
  * @param hex
- * @returns {bigInt.BigInteger}
+ * @returns {BigInt}
  */
 function toBigInt(hex) {
-    return BigInt(Buffer.isBuffer(hex) ? hex.toString('hex') : hex, 16);
+    return BigInt('0x' + (Buffer.isBuffer(hex) ? hex.toString('hex') : hex));
 }
 
 /**
@@ -275,10 +274,26 @@ function toBigInt(hex) {
  */
 function dump(key, value) {
     if (DEBUG) {
-        if (BigInt.isInstance(value)) {
+        if (typeof value === 'bigint') {
             value = value.toString(16);
         }
 
         console.log(key + '=' + value);
     }
-}
+}
+
+/**
+ * Calculates (base ^ exp) % mod using native BigInt.
+ */
+function modPow(base, exp, mod) {
+    let result = 1n;
+    base = base % mod;
+    while (exp > 0n) {
+        if (exp & 1n) {
+            result = (result * base) % mod;
+        }
+        base = (base * base) % mod;
+        exp >>= 1n;
+    }
+    return result;
+}