pws 1.0.0 → 1.0.1

data/README.md

@@ -15,8 +15,9 @@ You can install pws with
 
 Run `$ pws --help` for usage information.
 
-On linux, please make sure you've got `xclip` or `xsel` installed (clipboard).
+On Linux, please make sure you've got `xclip` or `xsel` installed (clipboard).
 
+On MacOS, the KDF might be generated pretty slow. You can work around this issue by using less iterations (see help) or [solving this problem](https://github.com/janlelis/pws/issues/7).
 
 Updating from 0.9
 ---

data/features/support/env.rb

@@ -12,12 +12,15 @@ ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File:
 # Hooks
 
 BEGIN{
-  $original_pws_file = ENV["PWS"]
+  $original_pws_file   = ENV["PWS"]
+  $original_iterations = ENV["PWS_ITERATIONS"]
+  ENV["PWS_ITERATIONS"] = "2"
 }
 
 END{
   Clipboard.clear
   ENV["PWS"] = $original_pws_file
+  ENV["PWS_ITERATIONS"] = $original_iterations
   FileUtils.rm Dir['pws-test-*']
 }
 

data/lib/pws/format/1.0.rb

@@ -4,6 +4,7 @@ require_relative '../format'
 require 'securerandom'
 require 'digest/hmac'
 require 'openssl'
+require 'pbkdf2'
 
 class PWS
   module Format
@@ -121,9 +122,15 @@ class PWS
           ]
         end
         
-        private
+        # support
+        
+        def hmac(key, *strings)
+          Digest::HMAC.new(key, Digest::SHA512).update(
+            strings.map(&:to_s).join
+          ).digest
+        end
         
-        def kdf(password, salt, iterations)
+        def kdf_openssl(password, salt, iterations)
           OpenSSL::PKCS5::pbkdf2_hmac(
             password,
             salt,
@@ -133,12 +140,27 @@ class PWS
           )
         end
         
-        def hmac(key, *strings)
-          Digest::HMAC.new(key, Digest::SHA512).update(
-            strings.map(&:to_s).join
-          ).digest
+        def kdf_ruby(password, salt, iterations)
+          PBKDF2.new(
+            password: password,
+            salt: salt,
+            iterations: iterations,
+            key_length: 512,
+            hash_function: OpenSSL::Digest::SHA512,
+          ).bin_string
         end
         
+        # see gh#7
+        begin
+          OpenSSL::PKCS5::pbkdf2_hmac("","",2,512,OpenSSL::Digest::SHA512.new)
+        rescue NotImplementedError
+          alias kdf kdf_ruby
+        else
+          alias kdf kdf_openssl
+        end
+        
+        private
+        
         def array_to_data_string(array)
           array.map{ |e|
             e = e.to_s

data/lib/pws/version.rb

@@ -1,3 +1,3 @@
 class PWS
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/pws.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'clipboard', '~> 1.0.1'
   s.add_dependency 'zucker',    '>= 12.1'
   s.add_dependency 'paint',     '>= 0.8.4'
+  s.add_dependency 'pbkdf2'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'aruba'
   s.add_development_dependency 'cucumber'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pws
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.4
+- !ruby/object:Gem::Dependency
+  name: pbkdf2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement