From f1ad0b7e428205a76f6176f44100eac39bb80310 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 22 Jun 2013 15:14:14 +0200
Subject: refactor: rename constants to calculate and clean up hash usage

---
 spec/calculate_spec.js | 35 +++++++++++++++++++++++++++++++++++
 spec/constants_spec.js | 35 -----------------------------------
 spec/runner.html       |  4 ++--
 spec/signup_spec.js    |  6 +++---
 4 files changed, 40 insertions(+), 40 deletions(-)
 create mode 100644 spec/calculate_spec.js
 delete mode 100644 spec/constants_spec.js

(limited to 'spec')

diff --git a/spec/calculate_spec.js b/spec/calculate_spec.js
new file mode 100644
index 0000000..f60c343
--- /dev/null
+++ b/spec/calculate_spec.js
@@ -0,0 +1,35 @@
+describe("Calculate", function() {
+  
+  beforeEach(function() {
+    calculate = new srp.Calculate();
+  });
+
+  // login attempt with correct password that failed never the less:
+  var compare = {
+    username: "blues",
+    password: "justtest",
+    salt: "6a6ef9ce5cb998eb",
+      v: "a5da6d376d503e22d93385db0244c382d1413d9f721ad9866dfc5e895cf2a3331514ceec5f48aceab58b260651cc9ee1ba96d906f67a6b4a7414c82d1333607ebe96403ecc86050224dc4c17b1d30efdbb451a68d1b6a25cce10f0e844082329d3cb46e1c3d46298a0de2cd3b8c6acc1a80c206f0f10ec8cd3c050babdf338ba",
+    aa: "4decb8543891f5a744b1e9b5bc375a474bfe3c5417e1db176cefcc7ba915338a14f309f8e0a4c7641bc9c9b9bd2e91c4d1beda1772c30d0350c9ba44f7c5911dfe6bb593ac2a2b30f1f6e5ec8a656cb4947c1907cf62f8d7283cbe32eb44b02158b51091ae130afa6063bb28cdea9ae159d4f222571e146f8715bfa31af09868",
+    a: "d498c3d024ec17689b5320e33fc349a3f3f91320384155b3043fa410c90eab71",
+    bb: "dee64fd54daafc18b338c5783ade3ff4275dfee8c97008e2d9fb445880a2e1d452c822a35e8e3f012bc6facaa28022f8de3fb1d632667d635abde0afc0ca4ed06c9197ea88f379042b10bc7b7f816a1ec14fefe6e9adef4ab904315b3a3f36749f3f6d1083b0eb0029173770f8e9342b098298389ba49a88d4ea6b78a7f576a4",
+    s: "50973f6e8134f95bd04f54f522e6e57d957d0640f91f0a989ff775712b81d5856ae3bdd2aa9c5eda8019e9db18065519c99c33a62c7f12f98e7aed60b153feee9ab73ba1272b4d76aa002da8cd47c6da733c88a0e70d4c3d6752fd366d66efe40870d26fd5d1755883b9489721e1881376628bf6ef89902f35e5e7e31227e2f",
+    k: "dd93e648abfe2ac6c6d46e062ded60b31ec043e55ceca1946ec29508f4c68461",
+    m: "ccf0c492f715484dc8343e22cd5967c2c5d01de743c5f0a9c5cfd017db1804c"
+  };
+  
+  it("calculates the proper A", function() {
+    expect(calculate.A(compare.a)).toBe(compare.aa);
+  });
+  
+  it("calculates the right x", function() {
+    x = calculate.X("testuser","password","7686acb8")
+    expect(x).toBe('84d6bb567ddf584b1d8c8728289644d45dbfbb02deedd05c0f64db96740f0398');
+  });
+
+  it("calculates the right verifier", function() {
+    x = calculate.X(compare.username, compare.password, compare.salt)
+    expect(calculate.V(x)).toBe(compare.v);
+  });
+  
+});
diff --git a/spec/constants_spec.js b/spec/constants_spec.js
deleted file mode 100644
index a8aa7fd..0000000
--- a/spec/constants_spec.js
+++ /dev/null
@@ -1,35 +0,0 @@
-describe("Constants", function() {
-  
-  beforeEach(function() {
-    constants = new srp.Constants();
-  });
-
-  // login attempt with correct password that failed never the less:
-  var compare = {
-    username: "blues",
-    password: "justtest",
-    salt: "6a6ef9ce5cb998eb",
-      v: "a5da6d376d503e22d93385db0244c382d1413d9f721ad9866dfc5e895cf2a3331514ceec5f48aceab58b260651cc9ee1ba96d906f67a6b4a7414c82d1333607ebe96403ecc86050224dc4c17b1d30efdbb451a68d1b6a25cce10f0e844082329d3cb46e1c3d46298a0de2cd3b8c6acc1a80c206f0f10ec8cd3c050babdf338ba",
-    aa: "4decb8543891f5a744b1e9b5bc375a474bfe3c5417e1db176cefcc7ba915338a14f309f8e0a4c7641bc9c9b9bd2e91c4d1beda1772c30d0350c9ba44f7c5911dfe6bb593ac2a2b30f1f6e5ec8a656cb4947c1907cf62f8d7283cbe32eb44b02158b51091ae130afa6063bb28cdea9ae159d4f222571e146f8715bfa31af09868",
-    a: "d498c3d024ec17689b5320e33fc349a3f3f91320384155b3043fa410c90eab71",
-    bb: "dee64fd54daafc18b338c5783ade3ff4275dfee8c97008e2d9fb445880a2e1d452c822a35e8e3f012bc6facaa28022f8de3fb1d632667d635abde0afc0ca4ed06c9197ea88f379042b10bc7b7f816a1ec14fefe6e9adef4ab904315b3a3f36749f3f6d1083b0eb0029173770f8e9342b098298389ba49a88d4ea6b78a7f576a4",
-    s: "50973f6e8134f95bd04f54f522e6e57d957d0640f91f0a989ff775712b81d5856ae3bdd2aa9c5eda8019e9db18065519c99c33a62c7f12f98e7aed60b153feee9ab73ba1272b4d76aa002da8cd47c6da733c88a0e70d4c3d6752fd366d66efe40870d26fd5d1755883b9489721e1881376628bf6ef89902f35e5e7e31227e2f",
-    k: "dd93e648abfe2ac6c6d46e062ded60b31ec043e55ceca1946ec29508f4c68461",
-    m: "ccf0c492f715484dc8343e22cd5967c2c5d01de743c5f0a9c5cfd017db1804c"
-  };
-  
-  it("calculates the proper A", function() {
-    expect(constants.calcA(compare.a)).toBe(compare.aa);
-  });
-  
-  it("calculates the right x", function() {
-    x = constants.calcX("testuser","password","7686acb8")
-    expect(x).toBe('84d6bb567ddf584b1d8c8728289644d45dbfbb02deedd05c0f64db96740f0398');
-  });
-
-  it("calculates the right verifier", function() {
-    x = constants.calcX(compare.username, compare.password, compare.salt)
-    expect(constants.calcV(x)).toBe(compare.v);
-  });
-  
-});
diff --git a/spec/runner.html b/spec/runner.html
index e94cd24..3a458df 100644
--- a/spec/runner.html
+++ b/spec/runner.html
@@ -23,14 +23,14 @@
   <script type="text/javascript" src="../lib/jsbn2.js"></script>
   <script type="text/javascript" src="../src/srp.js"></script>
   <script type="text/javascript" src="../src/jqueryRest.js"></script>
-  <script type="text/javascript" src="../src/srp_constants.js"></script>
+  <script type="text/javascript" src="../src/srp_calculate.js"></script>
   <script type="text/javascript" src="../src/srp_session.js"></script>
   
   <!-- include spec files here... -->
   <script type="text/javascript" src="helper.js"></script>
   <script type="text/javascript" src="signup_spec.js"></script>
   <script type="text/javascript" src="login_spec.js"></script>
-  <script type="text/javascript" src="constants_spec.js"></script>
+  <script type="text/javascript" src="calculate_spec.js"></script>
   <script type="text/javascript" src="session_spec.js"></script>
 
   <script type="text/javascript">
diff --git a/spec/signup_spec.js b/spec/signup_spec.js
index 70c6823..4f7a65d 100644
--- a/spec/signup_spec.js
+++ b/spec/signup_spec.js
@@ -9,9 +9,9 @@ describe("Signup with srp var", function() {
   
   beforeEach(function() {
     specHelper.setupFakeXHR.apply(this);
-    constants = new srp.Constants();
-    constants.randomSalt = function() {return "4c78c3f8"};
-    srp.session = new srp.Session(undefined, undefined, constants);
+    calculate = new srp.Calculate();
+    calculate.randomSalt = function() {return "4c78c3f8"};
+    srp.session = new srp.Session(undefined, undefined, calculate);
   });
 
   afterEach(function() {
-- 
cgit v1.2.3