From 85d5e37cc96cb6dc9677b3546abcd0611bf60810 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sun, 14 Jul 2013 14:00:44 +0200
Subject: more fixtures

---
 test/fixtures/failed_js_client.json | 12 ++++++++++++
 test/session_test.rb                |  7 -------
 test/test_helper.rb                 |  8 ++++++++
 3 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 test/fixtures/failed_js_client.json

(limited to 'test')

diff --git a/test/fixtures/failed_js_client.json b/test/fixtures/failed_js_client.json
new file mode 100644
index 0000000..374128a
--- /dev/null
+++ b/test/fixtures/failed_js_client.json
@@ -0,0 +1,12 @@
+{
+  "username": "asre",
+  "salt": "ae631d2d5ed2c41d",
+  "verifier": "8abe157957f22cc3b0b004e964d8f4d036636b23c6489877db9a9f7e19f21b78df5b489171996dd4a57ab6714e31ed0f3187c930dd0b00654cab60aaf73d701cf71d3faed99da9cd37c0161c93f3e12c2627e286df9217bad7731d51c7558a7d07d9888808c5b62b275b07706cf2e3d0cdc628791c69975580f760c7bf28bae8",
+  "a": "eb9784d9",
+  "aa": "ab0109064a2da3c02c0cc6da028495d402affb814f4b40898c9c87922718bd03dbd41cf2fa0e23f4abd0f19722c3687b673177328ae4f74f48f7d8fafc30466652e97a2f8c438b471eb0ccbe66fb5bf0837ac7b2aa34bfc731714c3ce4fbb288abd59458e2e563391925a8b74b4179652839ea91da40a467702b1574728c9e22",
+  "bb": "ccc834b851d7d6e1aa86969705ecd53fd47c5e94c1e31f739db3534a73dee8eed362747d7b4c60ea9169352000dfe42ca8ae5d3b20bb8f40590106021e7a4cd398ca2df55cc209ad9732c8d6bd6c6acf8a27254dac3c74cbb326ee53a4519e6a630ccadebf1434f5e3d9bf99c7cd301255c94710445383808638394dd641aa27",
+  "s": "919418fb396e125dc8e881b01f3925029e8049e0f15032f601317a99489526fd46b8e8edb62962177b97efe2106a7da44b381e65a500ff1a86459683475b86b31fd81e73accc835a5e0da37b71ed68612c68fbe43a96b57bf3f5d560f71f37a3dbc7a2080c8a4dd7de1bb42cc6e1a21e66e3845f775cb4559ba9ac1faf551a39",
+  "k": "aa8c328244c426c6165be08a1fa8b07e2949c1df577466b4815109221e2da6b",
+  "m": "8438a6e4f31334588b826ee92b7669dd8db59856c5934a9c659e1481bcdcae86",
+  "m2": "ec1fd1de67a08b981016272222f54f4b1c42768cb46cd3675fe6573fd60eb186"
+}
diff --git a/test/session_test.rb b/test/session_test.rb
index dc97077..ff3f4f3 100644
--- a/test/session_test.rb
+++ b/test/session_test.rb
@@ -38,13 +38,6 @@ class SessionTest < Test::Unit::TestCase
     assert_equal client, session.authenticate(data[:m].hex)
   end
 
-  def fixture(filename)
-    path = File.expand_path("../fixtures/#{filename}.json", __FILE__)
-    HashWithIndifferentAccess[JSON.parse(File.read(path))]
-  end
-
-
-
   def stub_client(data)
     @username = data[:username]
     @password = data[:password]
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 23ff39a..3f85b7a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -2,3 +2,11 @@ require "rubygems"
 require 'test/unit'
 require 'activesupport' # for HashWithIndifferentAccess
 require File.expand_path(File.dirname(__FILE__) + '/../lib/ruby-srp.rb')
+
+class Test::Unit::TestCase
+  def fixture(filename)
+    path = File.expand_path("../fixtures/#{filename}.json", __FILE__)
+    HashWithIndifferentAccess[JSON.parse(File.read(path))]
+  end
+end
+
-- 
cgit v1.2.3


From d508b7eb1f372f8c8175cc16e7669435d1fe995f Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sun, 14 Jul 2013 14:01:04 +0200
Subject: first take on a hex based api

---
 test/fixtures/failed_js_login.json |  2 +-
 test/session_test.rb               | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/test/fixtures/failed_js_login.json b/test/fixtures/failed_js_login.json
index 0de652c..37a67f3 100644
--- a/test/fixtures/failed_js_login.json
+++ b/test/fixtures/failed_js_login.json
@@ -6,7 +6,7 @@
   "aa": "4decb8543891f5a744b1e9b5bc375a474bfe3c5417e1db176cefcc7ba915338a14f309f8e0a4c7641bc9c9b9bd2e91c4d1beda1772c30d0350c9ba44f7c5911dfe6bb593ac2a2b30f1f6e5ec8a656cb4947c1907cf62f8d7283cbe32eb44b02158b51091ae130afa6063bb28cdea9ae159d4f222571e146f8715bfa31af09868",
   "b": "f393e04f8a0463b90227742217d7e1bbba82241a43beb372c4fc90539d24bdaf",
   "bb": "dee64fd54daafc18b338c5783ade3ff4275dfee8c97008e2d9fb445880a2e1d452c822a35e8e3f012bc6facaa28022f8de3fb1d632667d635abde0afc0ca4ed06c9197ea88f379042b10bc7b7f816a1ec14fefe6e9adef4ab904315b3a3f36749f3f6d1083b0eb0029173770f8e9342b098298389ba49a88d4ea6b78a7f576a4",
-  "m": "ccf0c492f715484dc8343e22cd5967c2c5d01de743c5f0a9c5cfd017db1804c",
+  "m": "0ccf0c492f715484dc8343e22cd5967c2c5d01de743c5f0a9c5cfd017db1804c",
   "s": "50973f6e8134f95bd04f54f522e6e57d957d0640f91f0a989ff775712b81d5856ae3bdd2aa9c5eda8019e9db18065519c99c33a62c7f12f98e7aed60b153feee9ab73ba1272b4d76aa002da8cd47c6da733c88a0e70d4c3d6752fd366d66efe40870d26fd5d1755883b9489721e1881376628bf6ef89902f35e5e7e31227e2f",
   "k": "dd93e648abfe2ac6c6d46e062ded60b31ec043e55ceca1946ec29508f4c68461"
 }
diff --git a/test/session_test.rb b/test/session_test.rb
index ff3f4f3..41d66b3 100644
--- a/test/session_test.rb
+++ b/test/session_test.rb
@@ -11,7 +11,7 @@ class SessionTest < Test::Unit::TestCase
     session = init_session(client, data)
 
     assert_same_values(data, session.internal_state)
-    assert_equal client, session.authenticate(data[:m].hex)
+    assert_equal client, session.authenticate(data[:m])
     assert_equal({:M2 => data[:m2]}, session.to_hash)
     assert_equal({'M2' => data[:m2]}.to_json, session.to_json)
   end
@@ -26,7 +26,7 @@ class SessionTest < Test::Unit::TestCase
     state.delete(:salt)
 
     assert_same_values(data, state)
-    assert_equal client, session.authenticate(data[:m].hex)
+    assert_equal client, session.authenticate(data[:m])
   end
 
   def test_failing_js_login
@@ -35,7 +35,7 @@ class SessionTest < Test::Unit::TestCase
     session = init_session(client, data)
 
     assert_same_values(data, session.internal_state)
-    assert_equal client, session.authenticate(data[:m].hex)
+    assert_equal client, session.authenticate(data[:m])
   end
 
   def stub_client(data)
@@ -50,11 +50,11 @@ class SessionTest < Test::Unit::TestCase
   end
 
   def init_session(client, data)
-    aa = data[:aa].hex
+    aa = data[:aa]
     b  = data[:b].hex
     session = SRP::Session.new(client, aa)
     # seed b to compare to py_srp
-    session.send(:initialize_server, aa, b)
+    session.send(:initialize_server, aa.hex, b)
     session
   end
 
-- 
cgit v1.2.3


From e4a577e45f36b3ed93d85fc466ae13217cca955c Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sun, 14 Jul 2013 14:22:31 +0200
Subject: store aa, bb and u as hex by default

---
 test/session_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/session_test.rb b/test/session_test.rb
index 41d66b3..6864de7 100644
--- a/test/session_test.rb
+++ b/test/session_test.rb
@@ -54,7 +54,7 @@ class SessionTest < Test::Unit::TestCase
     b  = data[:b].hex
     session = SRP::Session.new(client, aa)
     # seed b to compare to py_srp
-    session.send(:initialize_server, aa.hex, b)
+    session.send(:initialize_server, aa, b)
     session
   end
 
-- 
cgit v1.2.3