ruby_home-srp 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2765c12b81526b0ac2b75ecb5a9fb72dc8eb9eacd15f202eae42b48173b7626
-  data.tar.gz: 1ce14f917cfb48914bf3672c86daf6f7eea433008818405acadc943dd68251ef
+  metadata.gz: 25c1031ea96aad4daa522389f599b23cf9b148998204c52dd2c1b881258fd2e0
+  data.tar.gz: 301889c571ab47dca2a89ef3892245f0139824330ca3369f0a8321a531fe9e86
 SHA512:
-  metadata.gz: 6928695e8eddf92efce441554245f9fc434cd44da83225c25fa0c041ae87020acc14a375726094c9e746eb165a5994be68f991291efbab1e21171810aa0f6e1e
-  data.tar.gz: 345af332b94174d2fc10f16700be59a2d6a407dd8c53d49841efd862499d6150659ff0b09ad463e5614b1fb6f6d6a4064bbf0120d7b27eaffe875bf886db46e2
+  metadata.gz: 40feab5b7ebdae59b7a151192ee8db6f0ce0d08e31e86389ab2da20f8e53436c6438097607f82d76171f2cd013e536c63374d83e181db11192a69e1c6d2db9ac
+  data.tar.gz: 923941e50d2632883cd71db798c824450d7e3309204b3a46754e0ada580471dcffa421601bf878d2d937c70eef7e7e082331de3b95f403878f8c45395b249d50

data/lib/ruby_home-srp.rb

@@ -1,5 +1,6 @@
 require 'securerandom'
 require 'srp'
+require_relative 'ruby_home-srp/core_ext/integer'
 
 module RubyHome
   module SRP
@@ -21,10 +22,10 @@ module RubyHome
       # hashing function with padding.
       # Input is prefixed with 0 to meet N hex width.
       def H(n, *a)
-        nlen = 2 * ((('%x' % [n]).length * 4 + 7) >> 3)
+        nlen = 2 * (((n.to_hex_string).length * 4 + 7) >> 3)
         hashin = a.map {|s|
           next unless s
-          shex = s.class == String ? s : '%x' % s
+          shex = s.class == String ? s : s.to_hex_string
           if shex.length > nlen
             raise 'Bit width does not match - client uses different prime'
           end
@@ -53,9 +54,9 @@ module RubyHome
 
       # M = H(H(N) xor H(g), H(I), s, A, B, K)
       def calc_M(username, xsalt, xaa, xbb, xkk, n, g)
-        hn = sha512_hex('%x' % n).hex
+        hn = sha512_hex(n.to_hex_string).hex
         hg = sha512_hex(g).hex
-        hxor = '%x' % (hn ^ hg)
+        hxor = (hn ^ hg).to_hex_string
         hi = sha512_str(username)
 
         hashin = [hxor, hi, xsalt, xaa, xbb, xkk].join
@@ -112,7 +113,7 @@ module RubyHome
         @salt ||= random_salt
         x = SRP.calc_x(username, password, @salt)
         v = SRP.calc_v(x, @N, @g.hex)
-        return {:username => username, :verifier => '%x' % v, :salt => @salt}
+        return {:username => username, :verifier => v.to_hex_string, :salt => @salt}
       end
 
       # Authentication phase 1 - create challenge.
@@ -122,7 +123,7 @@ module RubyHome
         generate_B(xverifier)
         return {
           :challenge => {:B => @B, :salt => xsalt},
-          :proof     => {:B => @B, :b => '%x' % @b, :I => username, :s => xsalt, :v => xverifier}
+          :proof     => {:B => @B, :b => @b.to_hex_string, :I => username, :s => xsalt, :v => xverifier}
         }
       end
 
@@ -142,15 +143,15 @@ module RubyHome
         return false if @u == 0
 
         # calculate session key
-        @S = '%x' % SRP.calc_server_S(@A.to_i(16), @b, v, @u, @N)
+        @S = SRP.calc_server_S(@A.to_i(16), @b, v, @u, @N).to_hex_string
         @K = SRP.sha512_hex(@S)
 
         # calculate match
-        @M = '%x' % SRP.calc_M(username, xsalt, @A, @B, @K, @N, @g)
+        @M = SRP.calc_M(username, xsalt, @A, @B, @K, @N, @g).to_hex_string
 
         if @M == client_M
           # authentication succeeded
-          @H_AMK = '%x' % SRP.calc_H_AMK(@A, @M, @K, @N, @g)
+          @H_AMK = SRP.calc_H_AMK(@A, @M, @K, @N, @g).to_hex_string
           return @H_AMK
         end
         return false
@@ -165,7 +166,7 @@ module RubyHome
       end
 
       def u
-        '%x' % @u
+        @u.to_hex_string
       end
 
       # generates challenge
@@ -173,7 +174,7 @@ 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 = SRP.calc_B(@b, @k, v, @N, @g.hex).to_hex_string
       end
     end
 
@@ -194,7 +195,7 @@ module RubyHome
       # @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)
+        @A = SRP.calc_A(@a, @N, @g.hex).to_hex_string
       end
 
       # Phase 2 : Step 1 : Process the salt and B values provided by the server.
@@ -225,17 +226,17 @@ module RubyHome
         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)
+        @S = SRP.calc_client_S(bb, @a, @k, x, u, @N, @g.hex).to_hex_string
         @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)
+        @H_AMK = SRP.calc_H_AMK(@A, @M.to_hex_string, @K, @N, @g).to_hex_string
 
         # Return the 'M' matcher to be sent to the server
-        '%x' % @M
+        @M.to_hex_string
       end
     end
   end

data/lib/ruby_home-srp/core_ext/integer.rb

@@ -0,0 +1,11 @@
+class Integer
+  def to_hex_string(pad_char = '0')
+    hex_string = sprintf("%x", self.to_s)
+
+    if hex_string.length.even?
+      hex_string
+    else
+      hex_string + pad_char
+    end
+  end
+end

data/lib/ruby_home-srp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_home-srp
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Karl Entwistle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: srp-rb
@@ -62,6 +62,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/ruby_home-srp.rb
+- lib/ruby_home-srp/core_ext/integer.rb
 - lib/ruby_home-srp/version.rb
 - spec/spec_helper.rb
 homepage: https://github.com/karlentwistle/ruby_home-srp