diff options
author | Azul <azul@riseup.net> | 2013-03-20 12:52:24 +0100 |
---|---|---|
committer | Azul <azul@riseup.net> | 2013-03-20 12:52:24 +0100 |
commit | cc31045a9215ea255ab686040fce804859aadde7 (patch) | |
tree | 5afee96076bd922653231af818e98d5147457dff /src/srp_session.js | |
parent | cb46537c98db3cb7ac8cf23de243a86aa4a36acd (diff) | |
parent | d29d1146865d36e9d9789d3936e7a9163511be0a (diff) |
Merge branch 'release/0.3.0' into develop
Diffstat (limited to 'src/srp_session.js')
-rw-r--r-- | src/srp_session.js | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/srp_session.js b/src/srp_session.js index b278993..b1b6014 100644 --- a/src/srp_session.js +++ b/src/srp_session.js @@ -7,8 +7,7 @@ srp.Session = function(login, password) { var k = new BigInteger("bf66c44a428916cad64aa7c679f3fd897ad4c375e9bbb4cbf2f5de241d618ef0", 16); var rng = new SecureRandom(); -// var a = new BigInteger(32, rng); - var a = new BigInteger("d498c3d024ec17689b5320e33fc349a3f3f91320384155b3043fa410c90eab71", 16); + var a = new BigInteger(32, rng); var A = g.modPow(a, N); while(A.mod(N) == 0) { @@ -21,8 +20,8 @@ srp.Session = function(login, password) { var M = null; var M2 = null; var authenticated = false; - var I = login || document.getElementById("srp_username").value; - var pass = password || document.getElementById("srp_password").value; + var I = login; + var pass = password; // *** Accessor methods *** @@ -57,9 +56,16 @@ srp.Session = function(login, password) { // Returns the user's identity this.getI = function() { + I = login || document.getElementById("srp_username").value; return I; }; + // Returns the password currently typed in + this.getPass = function() { + pass = password || document.getElementById("srp_password").value; + return pass; + }; + // some 16 byte random number this.getSalt = function() { return new BigInteger(64, rng).toString(16); @@ -77,7 +83,8 @@ srp.Session = function(login, password) { // Calculates the X value and return it as a BigInteger this.calcX = function(salt) { - return new BigInteger(SHA256(hex2a(salt + SHA256(I + ":" + pass))), 16); + var inner = salt + SHA256(this.getI() + ":" + this.getPass()) + return new BigInteger(SHA256(hex2a(inner)), 16); }; this.getV = function(salt) |