pbkdf2-ruby 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/pbkdf2.rb

@@ -2,7 +2,7 @@ require 'openssl'
 
 class PBKDF2
   def initialize(opts={})
-    @hash_function = OpenSSL::Digest::Digest.new("sha256")
+    @hash_function = OpenSSL::Digest.new("sha256")
 
     # override with options
     opts.each_key do |k|
@@ -91,7 +91,7 @@ class PBKDF2
       # if it's a string, first strip off any leading 'hmacWith' (which is implied)
       hash.gsub!(/^hmacWith/i,'')
       # see if the OpenSSL lib understands it
-      hash = OpenSSL::Digest::Digest.new(hash)
+      hash = OpenSSL::Digest.new(hash)
     when OpenSSL::Digest
     when OpenSSL::Digest::Digest
       # ok

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pbkdf2-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -59,9 +59,7 @@ files:
 - README.markdown
 - Rakefile
 - VERSION
-- benchmark.rb
 - lib/pbkdf2.rb
-- pbkdf2.gemspec
 - spec/pbkdf2_spec.rb
 - spec/rfc3962_spec.rb
 - spec/spec.opts

data/benchmark.rb

@@ -1,33 +0,0 @@
-require 'benchmark'
-require 'lib/pbkdf2'
-
-n = 100000
-#
-# from active-ldap
-module Salt
-  CHARS = ['.', '/', '0'..'9', 'A'..'Z', 'a'..'z'].collect do |x|
-    x.to_a
-  end.flatten
-  module_function
-  def generate(length)
-    salt = ""
-    length.times {salt << CHARS[rand(CHARS.length)]}
-    salt
-  end
-end
-
-def next_salt
-  Salt.generate(8)
-end
-Benchmark.bm do |x|
-  x.report do
-    1.upto(n) do
-      PBKDF2.new do |p| 
-        p.password = "s33krit"
-        p.salt = next_salt
-        p.iterations = 1000
-      end
-    end
-  end
-end
-

data/pbkdf2.gemspec

@@ -1,52 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "pbkdf2"
-  s.version = "0.2.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Sam Quigley"]
-  s.date = "2013-10-23"
-  s.description = "This implementation conforms to RFC 2898, and has been tested using the test vectors in Appendix B of RFC 3962. Note, however, that while those specifications use HMAC-SHA-1, this implementation defaults to HMAC-SHA-256. (SHA-256 provides a longer bit length. In addition, NIST has stated that SHA-1 should be phased out due to concerns over recent cryptanalytic attacks.)"
-  s.email = "quigley@emerose.com"
-  s.extra_rdoc_files = [
-    "LICENSE.TXT",
-    "README.markdown"
-  ]
-  s.files = [
-    "LICENSE.TXT",
-    "README.markdown",
-    "Rakefile",
-    "VERSION",
-    "benchmark.rb",
-    "lib/pbkdf2.rb",
-    "pbkdf2.gemspec",
-    "spec/pbkdf2_spec.rb",
-    "spec/rfc3962_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = "http://github.com/emerose/pbkdf2-ruby"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Password-Based Key Derivation Function 2 - PBKDF2"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<rdoc>, [">= 2.4.2"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<rdoc>, [">= 2.4.2"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<rdoc>, [">= 2.4.2"])
-  end
-end
-