eth 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db681a04d032e6f5fc0b19b80a25669320bab4d8
-  data.tar.gz: 857cc5096068957845b303f52b52395dfc04de7f
+  metadata.gz: 0c5f0d8fb53ed83ac74dbcb8d22159f0345adcec
+  data.tar.gz: 6903709ca948490f7060ecef87dd1e213fda1c08
 SHA512:
-  metadata.gz: e90c62afa17c4b32bca70b794bd8e71fb197d238461b1b970e901cc74d06c43be8253770936a5afd4f82907759dfb6ab5901ab3da5fa9f9f1b3c16ac557a7648
-  data.tar.gz: '0528a1f59dd00444ad06734863de6f0a271f5c1b351eb3579b3e12343bb48a5bc1d78a94cabede50680d638b55282e0e0c18f8c6d51b39b344c44ed19075e40c'
+  metadata.gz: b4558847999d40a3bde43a4704767bf66afc7a32d719c87f2ee75008879bd73d598225de09980bd0087143b415ef21bc76ed83fd41c192a6a0ba797ad4ac848a
+  data.tar.gz: 111d01b2f8cf20d3a25bfcb9f098b1e643892dfe0d45a90c17d49a477ebca1259a13f775d3d22eaeeb8354aad6246ed5c543dae3b379bbb25fa6f6a42fdc435f

data/CHANGELOG.md

@@ -4,7 +4,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+## [0.4.6]
+
+### Added
+- Support scrypt private key decryption
+
+## [0.4.5]
+
+### Changed
+- Further improve Open SSL configurability
+
+## [0.4.4]
+
+### Changed
+- Support old versions of SSL to help avoid preious breaking changes
 
 ## [0.4.3]
 

data/eth.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ffi', '~> 1.0'
   spec.add_dependency 'money-tree', '~> 0.9'
   spec.add_dependency 'rlp', '~> 0.7.3'
+  spec.add_dependency 'scrypt', '~> 3.0.5'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'pry', '~> 0.1'

data/lib/eth/key/decrypter.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'scrypt'
 
 class Eth::Key::Decrypter
   include Eth::Utils
@@ -24,7 +25,15 @@ class Eth::Key::Decrypter
   attr_reader :data, :key, :password
 
   def derive_key(password)
-    @key = OpenSSL::PKCS5.pbkdf2_hmac(password, salt, iterations, key_length, digest)
+    case kdf
+    when 'pbkdf2'
+      @key = OpenSSL::PKCS5.pbkdf2_hmac(password, salt, iterations, key_length, digest)
+    when 'scrypt'
+      # OpenSSL 1.1 inclues OpenSSL::KDF.scrypt, but it is not available usually, otherwise we could do: OpenSSL::KDF.scrypt(password, salt: salt, N: n, r: r, p: p, length: key_length)
+      @key = SCrypt::Engine.scrypt(password, salt, n, r, p, key_length)
+    else
+      raise "Unsupported key derivation function: #{kdf}!"
+    end
   end
 
   def check_macs
@@ -72,8 +81,24 @@ class Eth::Key::Decrypter
     crypto_data['kdfparams']['c'].to_i
   end
 
+  def kdf
+    crypto_data['kdf']
+  end
+
   def key_length
-    32
+    crypto_data['kdfparams']['dklen'].to_i
+  end
+
+  def n
+    crypto_data['kdfparams']['n'].to_i
+  end
+
+  def r
+    crypto_data['kdfparams']['r'].to_i
+  end
+
+  def p
+    crypto_data['kdfparams']['p'].to_i
   end
 
   def digest
@@ -83,5 +108,6 @@ class Eth::Key::Decrypter
   def digest_name
     "sha256"
   end
+  
 
 end

data/lib/eth/version.rb

@@ -1,3 +1,3 @@
 module Eth
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eth
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Steve Ellis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-sha3
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.3
+- !ruby/object:Gem::Dependency
+  name: scrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement