ruby_home-srp 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01aa88f20f9d30e522a70b7b9b5fb46c0a88c72e17ed8497508673a49e3f4c81
-  data.tar.gz: be1162da69b86dbc69ac9a54f878ff10ff825691549058028e110c8f174f9e8d
+  metadata.gz: c2765c12b81526b0ac2b75ecb5a9fb72dc8eb9eacd15f202eae42b48173b7626
+  data.tar.gz: 1ce14f917cfb48914bf3672c86daf6f7eea433008818405acadc943dd68251ef
 SHA512:
-  metadata.gz: be13ad8ed43883b4c1bda4362481edcfe4ea1873afba34942157bf2a44b114672db9f783d7aa96dd6b5a0a640590b3b89b055381b2cb2e2bdcc63a53111fd4ce
-  data.tar.gz: ffffd98cda85809b6da6b921d39093acd974f379d9c6b877a5ab3a97b3fffebc3ade15179309ec837f82ec0203950c5793fbcc1759cea491972f1532109e4be6
+  metadata.gz: 6928695e8eddf92efce441554245f9fc434cd44da83225c25fa0c041ae87020acc14a375726094c9e746eb165a5994be68f991291efbab1e21171810aa0f6e1e
+  data.tar.gz: 345af332b94174d2fc10f16700be59a2d6a407dd8c53d49841efd862499d6150659ff0b09ad463e5614b1fb6f6d6a4064bbf0120d7b27eaffe875bf886db46e2

data/lib/ruby_home-srp.rb

@@ -26,7 +26,7 @@ module RubyHome
           next unless s
           shex = s.class == String ? s : '%x' % s
           if shex.length > nlen
-              raise 'Bit width does not match - client uses different prime'
+            raise 'Bit width does not match - client uses different prime'
           end
           '0' * (nlen - shex.length) + shex
         }.join('')
@@ -97,7 +97,7 @@ module RubyHome
 
     class Verifier < ::SRP::Verifier
       attr_reader :u
-      attr_writer :salt
+      attr_writer :salt, :b
 
       def initialize group=3072
         # select modulus (N) and generator (g)
@@ -173,7 +173,69 @@ module RubyHome
       def generate_B xverifier
         v = xverifier.to_i(16)
         @b ||= random_bignum
-        @B = '%x' % SRP.calc_B(@b, k, v, @N, @g.hex)
+        @B = '%x' % SRP.calc_B(@b, @k, v, @N, @g.hex)
+      end
+    end
+
+    class Client < ::SRP::Client
+      attr_writer :a
+
+      def initialize group=3072
+        # select modulus (N) and generator (g)
+        @N, @g = SRP.Ng group
+        @k = SRP.calc_k(@N, @g)
+      end
+
+      # Phase 1 : Step 1 : Start the authentication process by generating the
+      # client 'a' and 'A' values. Public 'A' should later be sent along with
+      # the username, to the server verifier to continue the auth process. The
+      # internal secret 'a' value should remain private.
+      #
+      # @return [String] the value of 'A' in hex
+      def start_authentication
+        @a ||= SecureRandom.hex(32).hex
+        @A = "%x" % SRP.calc_A(@a, @N, @g.hex)
+      end
+
+      # Phase 2 : Step 1 : Process the salt and B values provided by the server.
+      #
+      # @param username [String] the client provided authentication username
+      # @param password [String] the client provided authentication password
+      # @param xsalt [String] the server provided salt for the username in hex
+      # @param xbb [String] the server verifier 'B' value in hex
+      # @return [String] the client 'M' value in hex
+      def process_challenge(username, password, xsalt, xbb)
+        raise ArgumentError, 'username must be a string' unless username.is_a?(String) && !username.empty?
+        raise ArgumentError, 'password must be a string' unless password.is_a?(String) && !password.empty?
+        raise ArgumentError, 'xsalt must be a string' unless xsalt.is_a?(String)
+        raise ArgumentError, 'xsalt must be a hex string' unless xsalt =~ /^[a-fA-F0-9]+$/
+        raise ArgumentError, 'xbb must be a string' unless xbb.is_a?(String)
+        raise ArgumentError, 'xbb must be a hex string' unless xbb =~ /^[a-fA-F0-9]+$/
+
+        # Convert the 'B' hex value to an Integer
+        bb = xbb.to_i(16)
+
+        # SRP-6a safety check
+        return false if (bb % @N).zero?
+
+        x = SRP.calc_x(username, password, xsalt)
+        u = SRP.calc_u(@A, xbb, @N)
+
+        # SRP-6a safety check
+        return false if u.zero?
+
+        # Calculate session key 'S' and secret key 'K'
+        @S = '%x' % SRP.calc_client_S(bb, @a, @k, x, u, @N, @g.hex)
+        @K = SRP.sha512_hex(@S)
+
+        # Calculate the 'M' matcher
+        @M = SRP.calc_M(username, xsalt, @A, xbb, @K, @N, @g)
+
+        # Calculate the H(A,M,K) verifier
+        @H_AMK = '%x' % SRP.calc_H_AMK(@A, '%x' % @M, @K, @N, @g)
+
+        # Return the 'M' matcher to be sent to the server
+        '%x' % @M
       end
     end
   end

data/lib/ruby_home-srp/version.rb

@@ -1,5 +1,5 @@
 module RubyHome
   module SRP
-    VERSION = '1.1.1'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_home-srp
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Karl Entwistle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-31 00:00:00.000000000 Z
+date: 2018-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: srp-rb