bip_mnemonic 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bbf1e975d44bbde5154bcd0e878bebd99543b010
-  data.tar.gz: 12bffd32fff7bd73af2bf6acddaf79a2caea0a72
+SHA256:
+  metadata.gz: 866130921b342eab2a72f02b33e659e1a644b6a832d13e31af08bcbcd209f9ea
+  data.tar.gz: 8d2581038cc68b6ac8588b7274f425966bcb3d7078ee63638a1bc7a29893c3f1
 SHA512:
-  metadata.gz: 2e11c8dd13d1092926a1af73d2904b87581cceb68eeae4060374d65e09fc429f07a0919a34d8ea8d183c9929771af17d7100797427260787b496dd95dce0a18e
-  data.tar.gz: f63d15d3809ecec185c146cb155bf7368012b2cbc72fbe7bf357e3e63cfbb459116e32d54a32c5fbf8751f988c83fcaa05b8e931269fcd3d651bc7b1adbb6947
+  metadata.gz: 9e3416ed270b6c5679bf406cbaae6c67f29e30991a15adcd129e6d07ca9e0234b8d0f5c776d26d5e5114d7e3a76a9abfe70d934cf6ee7176c570e3ef0168e2b7
+  data.tar.gz: c8ea91e39855b9604d49ecbbb285c6916f2db3bd8135bd1ac4860010e1cdd84c619ea5b7e88c9454fe87da83275176a5e06613e4ac5dba298436bb19228bd985

data/lib/bip_mnemonic.rb

@@ -1,51 +1,66 @@
-require 'pbkdf2'
-
+require 'openssl'
 class BipMnemonic
-  VERSION = "0.0.2"
+  VERSION = '0.0.3'.freeze
+
   def self.to_mnemonic(options)
     options ||= {}
     bits = options[:bits] || 128
-    unless options[:entropy].nil?
-      raise ArgumentError, "Entropy is empty" if options[:entropy] == ""
-      entropy_bytes = [options[:entropy]].pack("H*")
+    if options[:entropy].nil?
+      entropy_bytes = OpenSSL::Random.random_bytes(bits / 8)
     else
-      entropy_bytes = OpenSSL::Random.pseudo_bytes(bits/8)
+      raise ArgumentError, 'Entropy is empty' if options[:entropy].empty?
+      entropy_bytes = [options[:entropy]].pack('H*')
     end
-    entropy_binary = entropy_bytes.unpack("B*").first
+    entropy_binary = entropy_bytes.unpack('B*').first
     seed_binary = entropy_binary + checksum(entropy_binary)
-    words_array = File.readlines(File.join(File.dirname(File.expand_path(__FILE__)), '../words/english.txt')).map(&:strip)
-    seed_binary.chars.each_slice(11).map(&:join).map{|item| item.to_i(2)}.map {|i| words_array[i]}.join(" ")
+    words_array = File.readlines(
+      File.join(
+        File.dirname(File.expand_path(__FILE__)), '../words/english.txt'
+      )
+    ).map(&:strip)
+    seed_binary.chars
+               .each_slice(11)
+               .map(&:join)
+               .map { |item| item.to_i(2) }
+               .map { |i| words_array[i] }
+               .join(' ')
   end
 
   def self.to_entropy(options)
     options ||= {}
-    raise ArgumentError, "Mnemonic not set" if options[:mnemonic].nil?
-    raise ArgumentError, "Mnemonic is empty" if options[:mnemonic] == ""
-    words_array = File.readlines(File.join(File.dirname(File.expand_path(__FILE__)), '../words/english.txt')).map(&:strip)
-    mnemonic_array = options[:mnemonic].split(" ").map do |word|
+    raise ArgumentError, 'Mnemonic not set' if options[:mnemonic].nil?
+    raise ArgumentError, 'Mnemonic is empty' if options[:mnemonic].empty?
+    words_array = File.readlines(
+      File.join(
+        File.dirname(File.expand_path(__FILE__)), '../words/english.txt'
+      )
+    ).map(&:strip)
+    mnemonic_array = options[:mnemonic].split(' ').map do |word|
       word_index = words_array.index(word)
-      raise IndexError, "Word not found in words list" if word_index.nil?
-      word_index.to_s(2).rjust(11,"0")
+      raise IndexError, 'Word not found in words list' if word_index.nil?
+      word_index.to_s(2).rjust(11, '0')
     end
     mnemonic_binary_with_checksum = mnemonic_array.join.to_s
-    entropy_binary = mnemonic_binary_with_checksum.slice(0,mnemonic_binary_with_checksum.length*32/33)
-    checksum_bits = mnemonic_binary_with_checksum.slice(-(entropy_binary.length/32),(entropy_binary.length/32))
-    if checksum(entropy_binary) == checksum_bits
-      return [entropy_binary].pack("B*").unpack("H*").first
-    else
-      raise SecurityError, "Checksum mismatch, invalid mnemonic"
-    end
+    entropy_binary =mnemonic_binary_with_checksum.slice(0, mnemonic_binary_with_checksum.length * 32 / 33)
+    checksum_bits = mnemonic_binary_with_checksum.slice(-(entropy_binary.length / 32), (entropy_binary.length / 32))
+    raise SecurityError, 'Checksum mismatch, invalid mnemonic' unless checksum(entropy_binary) == checksum_bits
+    [entropy_binary].pack('B*').unpack('H*').first
   end
 
   def self.checksum(entropy_binary)
-    sha256hash = OpenSSL::Digest::SHA256.hexdigest([entropy_binary].pack("B*"))
-    sha256hash_binary = [sha256hash].pack("H*").unpack("B*").first
-    binary_checksum = sha256hash_binary.slice(0,(entropy_binary.length/32))
+    sha256hash = OpenSSL::Digest::SHA256.hexdigest([entropy_binary].pack('B*'))
+    sha256hash_binary = [sha256hash].pack('H*').unpack('B*').first
+    sha256hash_binary.slice(0, (entropy_binary.length / 32))
   end
 
   def self.to_seed(options)
-    raise ArgumentError, "Mnemonic not set" if options[:mnemonic].nil?
-    PBKDF2.hex_string(password: options[:mnemonic], salt: "mnemonic#{options[:password]}", iterations: 2048, hash_function: OpenSSL::Digest::SHA512, key_length: 512)
+    raise ArgumentError, 'Mnemonic not set' if options[:mnemonic].nil?
+    OpenSSL::PKCS5.pbkdf2_hmac(
+      options[:mnemonic],
+      "mnemonic#{options[:password]}",
+      2048,
+      64,
+      OpenSSL::Digest::SHA512.new
+    ).unpack('H*')[0]
   end
-
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: bip_mnemonic
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sreekanth GS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -47,10 +47,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/bip_mnemonic.rb
-- lib/pbkdf2.rb
 - words/english.txt
 homepage: http://github.com/sreekanthgs/mnemonic
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -67,8 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: BipMnemonic words and seed generator based on BIP-39

data/lib/pbkdf2.rb

@@ -1,118 +0,0 @@
-# THIS IS A MINIMALLY MODIFIED IMPLEMENTATION OF PBKDF2, ORIGINALLY IMPLEMENTED BY
-# Sam Quigley. ORIGINAL IMPLEMENTATION AVAILABLE AT:
-# https://github.com/emerose/pbkdf2-ruby
-#
-# Copyright (c) 2008 Sam Quigley <quigley@emerose.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# This license is sometimes referred to as "The MIT License"
-
-require 'openssl'
-
-class PBKDF2
-  VERSION = "0.0.1"
-  def self.hex_string(options = {})
-
-    yield self if block_given?
-
-    # Raise errors for unset options, all are mandatory
-    raise ArgumentError, ":password is not set" if options[:password].nil?
-    raise ArgumentError, ":salt is not set" if options[:salt].nil?
-    raise ArgumentError, ":iterations is not set" if options[:iterations].nil?
-    raise ArgumentError, ":key_length is not set" if options[:key_length].nil?
-    raise ArgumentError, ":hash_function is not set" if options[:hash_function].nil?
-
-    options[:hash_function] = options[:hash_function].new
-    validate(options)
-    options[:key_length] = options[:key_length]/8
-
-    calculate!(options)
-  end
-
-  def self.validate(options)
-    raise ArgumentError, "Key is too short (< 1)" if options[:key_length] < 1
-    raise ArgumentError, "key is too long for hash function" if options[:key_length]/8 > ((2**32 - 1) * options[:hash_function].size)
-    raise ArgumentError, "iterations can't be less than 1" if options[:iterations] < 1
-  end
-
-  def self.prf(options, data)
-    OpenSSL::HMAC.digest(options[:hash_function], options[:password], data)
-  end
-
-  # this is a translation of the helper function "F" defined in the spec
-  def self.calculate_block(options, block_num)
-    # u_1:
-    u = prf(options, options[:salt]+[block_num].pack("N"))
-    ret = u
-    # u_2 through u_c:
-    2.upto(options[:iterations]) do
-      # calculate u_n
-      u = prf(options, u)
-      # xor it with the previous results
-      ret = ret^u
-    end
-    ret
-  end
-
-  # the bit that actually does the calculating
-  def self.calculate!(options)
-    # how many blocks we'll need to calculate (the last may be truncated)
-    blocks_needed = (options[:key_length].to_f / options[:hash_function].size).ceil
-    # reset
-    value = ""
-    # main block-calculating loop:
-    1.upto(blocks_needed) do |block_num|
-     value << calculate_block(options,block_num)
-    end
-    # truncate to desired length:
-    value = value.slice(0,options[:key_length]).unpack("H*").first
-    value
-  end
-
-end
-
-class String
-  if RUBY_VERSION >= "1.9"
-    def xor_impl(other)
-      result = "".encode("ASCII-8BIT")
-      o_bytes = other.bytes.to_a
-      bytes.each_with_index do |c, i|
-        result << (c ^ o_bytes[i])
-      end
-      result
-    end
-  else
-    def xor_impl(other)
-      result = (0..length-1).collect { |i| self[i] ^ other[i] }
-      result.pack("C*")
-    end
-  end
-
-  private :xor_impl
-
-  def ^(other)
-    raise ArgumentError, "Can't bitwise-XOR a String with a non-String" \
-      unless other.kind_of? String
-    raise ArgumentError, "Can't bitwise-XOR strings of different length" \
-      unless length == other.length
-
-    xor_impl(other)
-  end
-end