smbhash 1.0.0 → 1.0.1

data/.gitignore

@@ -0,0 +1,3 @@
+*.gem
+.bundle
+

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-script: rake test
+script: bundle exec rake spec
 rvm:
   - ruby-head
   - 2.1.1

data/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem 'rake'
+  gem 'rspec', '~> 2.14'
+end

data/Gemfile.lock

@@ -0,0 +1,20 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    rake (10.2.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  rspec (~> 2.14)

data/README.md

@@ -1,5 +1,6 @@
 # ruby-smbhash
 [![Build Status](https://travis-ci.org/krissi/ruby-smbhash.svg?branch=master)](https://travis-ci.org/krissi/ruby-smbhash)
+[![Gem Version](https://badge.fury.io/rb/smbhash.svg)](http://badge.fury.io/rb/smbhash)
 
 ## Description
 ruby-smbhash is a implementation of lanman and nt md4 hash functions for use in Samba style smbpasswd entries. It was stripped from ActiveSambaLDAP (http://asl.rubyforge.org/activesambaldap/)
@@ -12,16 +13,16 @@ ruby-smbhash is a implementation of lanman and nt md4 hash functions for use in
   * MRI 2.1.1
 
 ## Usage
-    require 'samba/encrypt'
+    require 'smbhash'
 
-    Samba::Encrypt.lm_hash    "password"
-    => "E52CAC67419A9A224A3B108F3FA6CB6D"
+    Smbhash.lm_hash    "password"
+    # => "E52CAC67419A9A224A3B108F3FA6CB6D"
 
-    Samba::Encrypt.ntlm_hash  "password"
-    => "8846F7EAEE8FB117AD06BDD830B7586C"
+    Smbhash.ntlm_hash  "password"
+    # => "8846F7EAEE8FB117AD06BDD830B7586C"
 
-    Samba::Encrypt.ntlmgen    "password"
-    => ["E52CAC67419A9A224A3B108F3FA6CB6D", "8846F7EAEE8FB117AD06BDD830B7586C"]
+    Smbhash.ntlmgen    "password"
+    # => ["E52CAC67419A9A224A3B108F3FA6CB6D", "8846F7EAEE8FB117AD06BDD830B7586C"]
 
 ## Credits
   * ActiveSambaLDAP project for sharing the code

data/Rakefile

@@ -1,11 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
 
-require 'rubygems'
-require 'rake/testtask'
+require 'bundler/setup'
+require 'rspec/core/rake_task'
 
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/test_*.rb']
-  t.verbose = false
-end
+RSpec::Core::RakeTask.new(:spec)
 

data/lib/smbhash.rb

@@ -6,10 +6,8 @@ module Smbhash
     dos_password = Private.convert_encoding("ISO-8859-1",
                                             encoding || "UTF-8",
                                             password.upcase)
-    if dos_password.size > 14
-      warn("password is truncated to 14 characters")
-      dos_password = dos_password[0, 14]
-    end
+    fail ArgumentError, 'Password must be > 14 characters in ISO-8859-1' if dos_password.size > 14
+
     Private.encrypt_14characters(dos_password).unpack("C*").collect do |char|
       "%02X" % char
     end.join
@@ -19,9 +17,9 @@ module Smbhash
     ucs2_password = Private.convert_encoding("UTF-16LE",
                                              encoding || "UTF-8",
                                              password)
-    if ucs2_password.size > 256
-      raise ArgumentError.new("must be <= 256 characters in UTF-16LE")
-    end
+
+    fail ArgumentError, 'Password must be > 255 characters in UTF-16LE' if ucs2_password.size > 255
+
     hex = OpenSSL::Digest::MD4.new(ucs2_password).hexdigest.upcase
     hex
   end

data/smbhash.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'smbhash'
-  s.version     = '1.0.0'
+  s.version     = '1.0.1'
   s.license     = 'MIT'
   s.summary     = "Lanman/NT hash generator"
   s.description = "An implementation of lanman and nt md4 hash functions for use in Samba style smbpasswd entries"
@@ -16,4 +16,5 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.8.7'
 
   s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
 end

data/spec/smbhash/smbhash_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+require 'smbhash'
+
+describe Smbhash do
+  describe '.lm_hash' do
+    it 'returns a valid lanman hash' do
+      expect(Smbhash.lm_hash("password")).to        eq("E52CAC67419A9A224A3B108F3FA6CB6D")
+      expect(Smbhash.lm_hash("paSSWOrd")).to        eq("E52CAC67419A9A224A3B108F3FA6CB6D")
+      expect(Smbhash.lm_hash("abcdefgabcdefg")).to  eq("E0C510199CC66ABDE0C510199CC66ABD")
+      expect(Smbhash.lm_hash("SecREt01")).to        eq("FF3750BCC2B22412C2265B23734E0DAC")
+    end
+
+    context 'when more than 14 chars are given as password' do
+      it 'raises an ArgumentError' do
+        expect { Smbhash.lm_hash('X' * 15) }.to raise_error(ArgumentError, /14 characters/)
+      end
+    end
+  end
+
+  describe '.ntlm_hash' do
+    it 'returns a valid ntlm hash' do
+      expect(Smbhash.ntlm_hash("password")).to    eq("8846F7EAEE8FB117AD06BDD830B7586C")
+    end
+
+    context 'when more than 255 chars are given as password' do
+      it 'raises an ArgumentError' do
+        expect { Smbhash.ntlm_hash('X' * 256) }.to raise_error(ArgumentError, /255 characters/)
+      end
+    end
+  end
+
+  describe '.ntlmgen' do
+    it 'returns the output of .lm_hash and .htlm_hash as array' do
+      expect(Smbhash).to receive(:lm_hash).with("password", anything())
+      expect(Smbhash).to receive(:ntlm_hash).with("password", anything())
+      Smbhash.ntlmgen("password")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+require 'rspec'
+
+RSpec.configure do |c|
+  c.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smbhash
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &20347200 !ruby/object:Gem::Requirement
+  requirement: &12201080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20347200
+  version_requirements: *12201080
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &12200140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *12200140
 description: An implementation of lanman and nt md4 hash functions for use in Samba
   style smbpasswd entries
 email: 
@@ -29,14 +40,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - .travis.yml
+- Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - lib/smbhash.rb
 - lib/smbhash/methods18.rb
 - lib/smbhash/methods19.rb
 - smbhash.gemspec
-- test/test_samba_encrypt.rb
+- spec/smbhash/smbhash_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/krissi/ruby-smbhash
 licenses:
 - MIT
@@ -63,4 +78,5 @@ signing_key:
 specification_version: 3
 summary: Lanman/NT hash generator
 test_files:
-- test/test_samba_encrypt.rb
+- spec/smbhash/smbhash_spec.rb
+- spec/spec_helper.rb

data/test/test_samba_encrypt.rb

@@ -1,39 +0,0 @@
-require 'test/unit'
-require 'stringio'
-require 'smbhash'
-
-class SambaEncryptTest < Test::Unit::TestCase
-  def test_lm_hash
-    assert_equal("E52CAC67419A9A224A3B108F3FA6CB6D",
-                 Smbhash.lm_hash("password"))
-    assert_equal("E52CAC67419A9A224A3B108F3FA6CB6D",
-                 Smbhash.lm_hash("paSSWOrd"))
-    assert_equal("E0C510199CC66ABDE0C510199CC66ABD",
-                 Smbhash.lm_hash("abcdefgabcdefg"))
-    assert_equal("FF3750BCC2B22412C2265B23734E0DAC",
-                 Smbhash.lm_hash("SecREt01"))
-    begin
-      stderr = $stderr
-      $stderr = StringIO.new
-      assert_equal("E0C510199CC66ABDE0C510199CC66ABD",
-                   Smbhash.lm_hash("abcdefgabcdefg" + "X"))
-      assert_equal("E0C510199CC66ABDE0C510199CC66ABD",
-                   Smbhash.lm_hash("abcdefgabcdefg" + "X" * 100))
-      assert_equal("password is truncated to 14 characters\n" * 2,
-                   $stderr.string)
-    ensure
-      $stderr = stderr
-    end
-  end
-
-  def test_ntlm_hash
-    assert_equal("8846F7EAEE8FB117AD06BDD830B7586C",
-                 Smbhash.ntlm_hash("password"))
-  end
-
-  def test_ntlmgen 
-    assert_equal(["E52CAC67419A9A224A3B108F3FA6CB6D", "8846F7EAEE8FB117AD06BDD830B7586C"], 
-                 Smbhash.ntlmgen("password"))
-  end
-
-end