ciri-crypto 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed1a25ffdb3a238cc655ca8240ce9628c4f2d2980b39c9bd9535ddc51a60a5a2
-  data.tar.gz: '068652f8d6606fdf23eed3cfecceb099ba79889a0be1e85077ba7782c3fb996c'
+  metadata.gz: 456517177da7e8d25c25252e1ad9f05ece11fd3badaf12dbabdf204d6f21d310
+  data.tar.gz: d8b537b9dbd9e6a3e9ed082d23990f47ff60e025ccfd9170057b742e114915d7
 SHA512:
-  metadata.gz: 2cbec214f56c456110e1c63332f8067cf9750e2545b58cd68a8bf6256ed5f13207394d7a3114d8340ca5c7876bae3b7f403799d1827070047fcb0ca82ed752f5
-  data.tar.gz: 5f8ee8ed224fb3e4b5220dfe882f4e26b5c06ebb292414550572fcfac25b684a16ea0d66d79edd1282b60555c859b7c9d8f8e85afe853b9ba3470503bbbd3fd9
+  metadata.gz: 87a95cbc31d4ced2ca7ba222b8a706308cfa118ba10e8278bdcebf43867667639c7671a0b64b29db580f7f178d12d62595ef7bd12bdd71f896620fe96da2c519
+  data.tar.gz: e7ba8cc52e1c2df039b3b5c4af3ab011926744b64638e899289e6025c29e31536548a322720a9e4e890d9a0f0080e832cce4192f4e153e640951830c13259219

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ciri-crypto (0.1.0)
+    ciri-crypto (0.1.1)
       bitcoin-secp256k1 (~> 0.4.0)
       ciri-utils (~> 0.2.0)
 

data/README.md

@@ -22,19 +22,21 @@ Or install it yourself as:
 
 ```ruby
   # signature
-  Ciri::Crypto.esdsa_signature(key, data)
+  Ciri::Crypto.esdsa_signature("\x00...(privkey)", "\x00...(data)")
   
   # recover
-  Ciri::Crypto.ecdsa_recover(msg, signature, return_raw_key: true)
+  Ciri::Crypto.ecdsa_recover("I\x90...(signed hash)", "f\xAA...(signature)", return_raw_key: true)
   
   # ecies encrypt
-  Ciri::Crypto.ecies_encrypt(message, raw_pubkey, shared_mac_data = '')
+  key = OpenSSL::PKey::EC.new('secp256k1')
+  key.generate_key 
+  encrypt_data = Ciri::Crypto.ecies_encrypt("hello ciri", key, shared_mac_data = '')
   
   # ecies decrypt
-  Ciri::Crypto.ecies_encrypt(data, private_key, shared_mac_data = '')
+  Ciri::Crypto.ecies_decrypt(encrypt_data, key, shared_mac_data = '')
   
   # ensure secp256k1 key 
-  Ciri::Crypto.ensure_secp256k1_key(private_key) 
+  Ciri::Crypto.ensure_secp256k1_key(privkey: "\x00...") 
 ```
 
 ## Development

data/ciri-crypto.gemspec

@@ -6,8 +6,8 @@ require "ciri/crypto/version"
 Gem::Specification.new do |spec|
   spec.name          = "ciri-crypto"
   spec.version       = Ciri::Crypto::VERSION
-  spec.authors       = ["classicalliu"]
-  spec.email         = ["classicalliu@gmail.com"]
+  spec.authors       = ["classicalliu", "Jiang Jinyang"]
+  spec.email         = ["classicalliu@gmail.com", "jjyruby@gmail.com"]
 
   spec.summary       = %q{Crypto module of [Ciri](https://github.com/ciri-ethereum/ciri)}
   spec.description   = %q{A Ciri crypto module}

data/lib/ciri/crypto.rb

@@ -28,9 +28,8 @@ require 'openssl'
 require 'ciri/utils'
 require 'secp256k1'
 
-require_relative "./crypto/errors"
-require_relative "./crypto/signature"
-require_relative "./key"
+require_relative "crypto/errors"
+require_relative "crypto/signature"
 
 module Ciri
   module Crypto

data/lib/ciri/crypto/signature.rb

@@ -21,7 +21,7 @@
 # THE SOFTWARE.
 
 require "ciri/utils"
-require_relative "./errors"
+require_relative "errors"
 
 module Ciri
   module Crypto

data/lib/ciri/crypto/version.rb

@@ -1,5 +1,5 @@
 module Ciri
   module Crypto
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ciri-crypto
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - classicalliu
+- Jiang Jinyang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-15 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,6 +84,7 @@ dependencies:
 description: A Ciri crypto module
 email:
 - classicalliu@gmail.com
+- jjyruby@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -103,7 +105,6 @@ files:
 - lib/ciri/crypto/errors.rb
 - lib/ciri/crypto/signature.rb
 - lib/ciri/crypto/version.rb
-- lib/ciri/key.rb
 homepage: https://github.com/ciri-ethereum/ciri
 licenses:
 - MIT
@@ -125,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.0.beta1
 signing_key: 
 specification_version: 4
 summary: Crypto module of [Ciri](https://github.com/ciri-ethereum/ciri)

data/lib/ciri/key.rb

@@ -1,88 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2018, by Jiang Jinyang. <https://justjjy.com>, classicalliu.
-#
-# 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.
-
-
-require 'openssl'
-require 'ciri/utils'
-require_relative 'crypto'
-
-module Ciri
-
-  # Ciri::Key represent private/public key pair, it support several encryption methods used in Ethereum
-  #
-  # Examples:
-  #
-  #   key = Ciri::Key.random
-  #   key.ecdsa_signature(data)
-  #
-  class Key
-
-    class << self
-      def ecdsa_recover(msg, signature)
-        raw_public_key = Crypto.ecdsa_recover(msg, signature, return_raw_key: true)
-        Ciri::Key.new(raw_public_key: raw_public_key)
-      end
-
-      def random
-        ec_key = OpenSSL::PKey::EC.new('secp256k1')
-        ec_key.generate_key
-        Ciri::Key.new(ec_key: ec_key)
-      end
-    end
-
-    attr_reader :ec_key
-
-    # initialized from ec_key or raw keys
-    # ec_key is a OpenSSL::PKey::EC object, raw keys is bytes presented keys
-    def initialize(ec_key: nil, raw_public_key: nil, raw_private_key: nil)
-      @ec_key = ec_key || Ciri::Utils.create_ec_pk(raw_privkey: raw_private_key, raw_pubkey: raw_public_key)
-    end
-
-    # raw public key
-    def raw_public_key
-      @raw_public_key ||= ec_key.public_key.to_bn.to_s(2)
-    end
-
-    def ecdsa_signature(data)
-      Crypto.ecdsa_signature(secp256k1_key, data)
-    end
-
-    def ecies_encrypt(message, shared_mac_data = '')
-      Crypto.ecies_encrypt(message, ec_key, shared_mac_data)
-    end
-
-    def ecies_decrypt(data, shared_mac_data = '')
-      Crypto.ecies_decrypt(data, ec_key, shared_mac_data)
-    end
-
-    private
-
-    def secp256k1_key
-      privkey = ec_key.private_key.to_s(2)
-      # some times below error will occurs, raise error with more detail
-      unless privkey.instance_of?(String) && privkey.size == 32
-        raise ArgumentError, "privkey must be composed of 32 bytes, #{bytes}: #{privkey.size} privkey: #{Utils.to_hex privkey}"
-      end
-      @secp256k1_key ||= Crypto.ensure_secp256k1_key(privkey: privkey)
-    end
-  end
-end