rubyntlm 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33cb0ea71a4b1d8149a2a8bf39c5f24bd2752d5b
-  data.tar.gz: 032e16ead1a05ddcf0268d79c4ffff2ff631bfcf
+  metadata.gz: b0f0a253f64eaf9c8dc94df34a8f2ca3e92cc43f
+  data.tar.gz: 85e3ac2289f6ed8cd265429280e2be7c1187d05d
 SHA512:
-  metadata.gz: c276677b10f3f2b7fa35817fce82e1cfd5012298c752fbfc4576f0b4d45d339a5e6589fb547c16aa6609cb4174f2e9ac396c0f49ad7e7267f5b68b20f6e1fa47
-  data.tar.gz: 40e3423ad351782e571611b32704b583c0b75a06a2b3acedc62dc9c6e916b0bc3356fe51d1060dd3cda0ef330b175ad108623625b3f7a6f6eb7728f66d03216e
+  metadata.gz: 9a87594be04e9d3cd5630e0ad3ed19f8d069daf4c39c78b33f5c19487fdc97960e40bc2f62b689c5f4004895befc5cb1ab38d4a781d630bcda4b50aa098d1112
+  data.tar.gz: 7697d3619ceef486dcde7461eabc8ba9f0a7e60f9315088e01f23285b029e506b80c6f509f3aa3964fb593b6a3842a6669e96e115ad11b69d47f3c988bddea12

data/lib/net/ntlm/client.rb

@@ -42,6 +42,10 @@ module Net
         @session
       end
 
+      def session_key
+        @session.exported_session_key
+      end
+
       private
 
       # @return [Message::Type1]

data/lib/net/ntlm/client/session.rb

@@ -38,13 +38,24 @@ module Net
           rc4 = OpenSSL::Cipher::Cipher.new("rc4")
           rc4.encrypt
           rc4.key = user_session_key
-          sk = rc4.update master_key
+          sk = rc4.update exported_session_key
           sk << rc4.final
           t3.session_key = sk
         end
         t3
       end
 
+      def exported_session_key
+        @exported_session_key ||=
+          begin
+            if negotiate_key_exchange?
+              OpenSSL::Cipher.new("rc4").random_key
+            else
+              user_session_key
+            end
+          end
+      end
+
       def sign_message(message)
         seq = sequence
         sig = OpenSSL::HMAC.digest(OpenSSL::Digest::MD5.new, client_sign_key, "#{seq}#{message}")[0..7]
@@ -75,7 +86,6 @@ module Net
         message + server_cipher.final
       end
 
-
       private
 
 
@@ -83,16 +93,6 @@ module Net
         @user_session_key ||=  nil
       end
 
-      def master_key
-        @master_key ||= begin
-                          if negotiate_key_exchange?
-                            OpenSSL::Cipher.new("rc4").random_key
-                          else
-                            user_session_key
-                          end
-                        end
-      end
-
       def sequence
         [raw_sequence].pack("V*")
       end
@@ -106,19 +106,19 @@ module Net
       end
 
       def client_sign_key
-        @client_sign_key ||= OpenSSL::Digest::MD5.digest "#{master_key}#{CLIENT_TO_SERVER_SIGNING}"
+        @client_sign_key ||= OpenSSL::Digest::MD5.digest "#{exported_session_key}#{CLIENT_TO_SERVER_SIGNING}"
       end
 
       def server_sign_key
-        @server_sign_key ||= OpenSSL::Digest::MD5.digest "#{master_key}#{SERVER_TO_CLIENT_SIGNING}"
+        @server_sign_key ||= OpenSSL::Digest::MD5.digest "#{exported_session_key}#{SERVER_TO_CLIENT_SIGNING}"
       end
 
       def client_seal_key
-        @client_seal_key ||= OpenSSL::Digest::MD5.digest "#{master_key}#{CLIENT_TO_SERVER_SEALING}"
+        @client_seal_key ||= OpenSSL::Digest::MD5.digest "#{exported_session_key}#{CLIENT_TO_SERVER_SEALING}"
       end
 
       def server_seal_key
-        @server_seal_key ||= OpenSSL::Digest::MD5.digest "#{master_key}#{SERVER_TO_CLIENT_SEALING}"
+        @server_seal_key ||= OpenSSL::Digest::MD5.digest "#{exported_session_key}#{SERVER_TO_CLIENT_SEALING}"
       end
 
       def client_cipher

data/lib/net/ntlm/message/type2.rb

@@ -77,8 +77,10 @@ module Net
             ar = {:ntlm_hash => NTLM::ntlm_hash(pwd, opt), :challenge => chal}
             lm_res, ntlm_res = NTLM::ntlm2_session(ar, opt)
           else
-            lm_res = NTLM::lm_response(pwd, chal)
-            ntlm_res = NTLM::ntlm_response(pwd, chal)
+            ar = {:lm_hash => NTLM::lm_hash(pwd), :challenge => chal}
+            lm_res = NTLM::lm_response(ar)
+            ar = {:ntlm_hash => NTLM::ntlm_hash(pwd, opt), :challenge => chal}
+            ntlm_res = NTLM::ntlm_response(ar)
           end
 
           Type3.create({

data/lib/net/ntlm/version.rb

@@ -4,7 +4,7 @@ module Net
     module VERSION
       MAJOR = 0
       MINOR = 5
-      TINY  = 0
+      TINY  = 1
       STRING = [MAJOR, MINOR, TINY].join('.')
     end
   end

data/spec/lib/net/ntlm/client/session_spec.rb

@@ -51,17 +51,17 @@ describe Net::NTLM::Client::Session do
     end
   end
 
-  describe "#master_key" do
+  describe "#exported_session_key" do
     it "returns a random 16-byte key when negotiate_key_exchange? is true" do
       expect(inst).to receive(:negotiate_key_exchange?).and_return(true)
       expect(inst).not_to receive(:user_session_key)
-      inst.send :master_key
+      inst.exported_session_key
     end
 
     it "returns the user_session_key when negotiate_key_exchange? is false" do
       expect(inst).to receive(:negotiate_key_exchange?).and_return(false)
       expect(inst).to receive(:user_session_key).and_return(user_session_key)
-      inst.send :master_key
+      inst.exported_session_key
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyntlm
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Kohei Kajimoto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Ruby/NTLM library.