rbsecp256k1 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5549a7ec71d1bddbefe1ea360d9316ea1bbe74f015e6676cfc7495a7b852831a
-  data.tar.gz: dada9673b8fdf01e29ca2a2479ac3ce92ff43ba736f577feb6e58515ae3ab240
+  metadata.gz: adc488ad0d13cd01f56ce39b7c323ea57d9226b9380d747ebb8ef0c4cc62d6d1
+  data.tar.gz: 3118c92e72f09ff255483f7c90665236b9b060a881eb4c7d54b9d3a2791df747
 SHA512:
-  metadata.gz: 9ac13a464fd1e0c5ee4378cea9f6b9c557d65b08e00a00f4dc94b64fc43822cec9c5e69463a450daa6725d12679a5e9440bb0e60a20f282346551099b64e2802
-  data.tar.gz: 58f2932b693056f4051094d43d68636c2a3d99c71d475c5c1e7ca9c062a4e5d956e844209956e7e4041351677e4c4b376bd4b4a0e9dbdc13dab7e52c099302d0
+  metadata.gz: 5863c53473f0a162fffc82e319ab255b3e234acd0d425637783177e4c47e38768992b9d712f8957369e2ed53241eee377c31510e486d887e2cb6e9b12bb667b2
+  data.tar.gz: 046edbc96b3864969015ea02b2016fb167ae0c93172621801d7788ea484d3418a5868a8396aea57b4fbd21298157aa5a383b990dce00f2cceff68dd9f12106f0

data/ext/rbsecp256k1/extconf.rb

@@ -1,14 +1,107 @@
+require 'mini_portile2'
 require 'mkmf'
+require 'zip'
+
+# Recipe for downloading and building libsecp256k1 as part of installation
+class Secp256k1Recipe < MiniPortile
+  # Hard-coded URL for libsecp256k1 zipfile (HEAD of master as of 26-11-2018)
+  LIBSECP256K1_ZIP_URL = 'https://github.com/bitcoin-core/secp256k1/archive/e34ceb333b1c0e6f4115ecbb80c632ac1042fa49.zip'.freeze
+
+  # Expected SHA-256 of the zipfile above (computed using sha256sum)
+  LIBSECP256K1_SHA256 = 'd87d3ca7ebc42edbabb0f38e79205040b24b09b3e6d1c9ac89585de9bf302143'.freeze
+
+  WITH_RECOVERY = ENV.fetch('WITH_RECOVERY', '1') == '1'
+  WITH_ECDH = ENV.fetch('WITH_ECDH', '1') == '1'
+
+  def initialize
+    super('libsecp256k1', '0.0.0')
+    @tarball = File.join(Dir.pwd, "/ports/archives/libsecp256k1.zip")
+    @files = ["file://#{@tarball}"]
+    self.configure_options += [
+      "--disable-benchmark",
+      "--disable-exhaustive-tests",
+      "--disable-tests",
+      "--disable-debug",
+      "--enable-experimental",
+      "--with-pic=yes"
+    ]
+
+    configure_options << "--enable-module-recovery" if WITH_RECOVERY
+    configure_options << "--enable-module-ecdh" if WITH_ECDH
+  end
+
+  def configure
+    # Need to run autogen.sh before configure since it creates it
+    if RUBY_PLATFORM =~ /mingw|mswin/
+      # Windows doesn't recognize the shebang.
+      execute('autogen', %w[sh ./autogen.sh])
+    else
+      execute('autogen', %w[./autogen.sh])
+    end
+
+    super
+  end
+
+  def download
+    download_file_http(LIBSECP256K1_ZIP_URL, @tarball)
+    verify_file(local_path: @tarball, sha256: LIBSECP256K1_SHA256)
+  end
+
+  def downloaded?
+    File.exist?(@tarball)
+  end
+
+  def extract_zip_file(file, destination)
+    FileUtils.mkdir_p(destination)
+
+    Zip::File.open(file) do |zip_file|
+      zip_file.each do |f|
+        fpath = File.join(destination, f.name)
+        zip_file.extract(f, fpath) unless File.exist?(fpath)
+      end
+    end
+  end
+
+  def extract
+    files_hashs.each do |file|
+      extract_zip_file(file[:local_path], tmp_path)
+    end
+  end
+end
 
 # OpenSSL flags
 print("checking for OpenSSL\n")
 results = pkg_config('openssl')
-abort "missing openssl pkg-config information" unless results[1]
+abort "missing openssl pkg-config information" unless results && results[1]
+
+if with_config('system-library')
+  # Require that libsecp256k1 be installed using `make install` or similar.
+  print("checking for libsecp256k1\n")
+  results = pkg_config('libsecp256k1')
+  abort "missing libsecp256k1" unless results && results[1]
+else
+  # Build the libsecp256k1 dependency
+  recipe = Secp256k1Recipe.new
+  recipe.cook
+  recipe.activate
+
+  # Need to add paths to includes and libraries for library for build
+  append_cflags(
+    [
+      "-I#{recipe.path}/include",
+      "-fPIC",
+      "-Wno-undef",
+      "-Wall"
+    ]
+  )
+  # rubocop:disable Style/GlobalVars
+  $LIBPATH = ["#{recipe.path}/lib"] | $LIBPATH
+  # rubocop:enable Style/GlobalVars
 
-# Require that libsecp256k1 be installed using `make install` or similar.
-print("checking for libsecp256k1\n")
-results = pkg_config('libsecp256k1')
-abort "missing libsecp256k1" unless results[1]
+  # Also need to make sure we add the library as part of the build
+  have_library("secp256k1")
+  have_library("gmp")
+end
 
 # Check if we have the libsecp256k1 recoverable signature header.
 have_header('secp256k1_recovery.h')

data/ext/rbsecp256k1/rbsecp256k1.c

@@ -277,7 +277,7 @@ typedef enum ResultT_dummy {
  *   RESULT_FAILURE otherwise.
  */
 static ResultT
-GenerateRandomBytes(unsigned char *out_bytes, size_t in_size)
+GenerateRandomBytes(unsigned char *out_bytes, int in_size)
 {
   // OpenSSL RNG has not been seeded with enough data and is therefore
   // not usable.
@@ -1110,7 +1110,7 @@ Context_public_key_from_data(VALUE self, VALUE in_public_key_data)
   return PublicKey_create_from_data(
     context,
     public_key_data,
-    RSTRING_LEN(in_public_key_data)
+    (int)RSTRING_LEN(in_public_key_data)
   );
 }
 
@@ -1156,6 +1156,8 @@ Context_key_pair_from_private_key(VALUE self, VALUE in_private_key_data)
   VALUE private_key;
   unsigned char *private_key_data;
 
+  Check_Type(in_private_key_data, T_STRING);
+
   if (RSTRING_LEN(in_private_key_data) != 32)
   {
     rb_raise(rb_eArgError, "private key data must be 32 bytes in length");
@@ -1229,6 +1231,13 @@ Context_signature_from_compact(VALUE self, VALUE in_compact_signature)
   VALUE signature_result;
   unsigned char *signature_data;
 
+  Check_Type(in_compact_signature, T_STRING);
+
+  if (RSTRING_LEN(in_compact_signature) != 64)
+  {
+    rb_raise(rb_eArgError, "compact signature must be 64 bytes");
+  }
+
   TypedData_Get_Struct(self, Context, &Context_DataType, context);
   signature_data = (unsigned char*)StringValuePtr(in_compact_signature);
 
@@ -1393,10 +1402,11 @@ Context_sign_recoverable(VALUE self, VALUE in_private_key, VALUE in_hash32)
  *
  * @param in_compact_sig [String] binary string containing compact signature
  *   data.
- * @param in_recovery_id [Integer] recovery ID.
+ * @param in_recovery_id [Integer] recovery ID (range [0, 3])
  * @return [Secp256k1::RecoverableSignature] signature parsed from data.
  * @raise [RuntimeError] if signature data or recovery ID is invalid.
- * @raise [ArgumentError] if compact signature is not 64 bytes.
+ * @raise [ArgumentError] if compact signature is not 64 bytes or recovery ID
+ *   is not in range [0, 3].
  */
 static VALUE
 Context_recoverable_signature_from_compact(
@@ -1420,6 +1430,11 @@ Context_recoverable_signature_from_compact(
     rb_raise(rb_eArgError, "compact signature is not 64 bytes");
   }
 
+  if (recovery_id < 0 || recovery_id > 3)
+  {
+    rb_raise(rb_eArgError, "invalid recovery ID, must be in range [0, 3]");
+  }
+
   result = RecoverableSignature_alloc(Secp256k1_RecoverableSignature_class);
   TypedData_Get_Struct(
     result,

data/lib/rbsecp256k1/version.rb

@@ -1,3 +1,3 @@
 module Secp256k1
-  VERSION = '2.0.0'.freeze
+  VERSION = '3.0.0'.freeze
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rbsecp256k1
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Eric Scrivner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-01 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mini_portile2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -117,5 +145,6 @@ rubyforge_project:
 rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: Compiled, native ruby extension interfaces to libsecp256k1
+summary: Compiled, native ruby extension interfaces to libsecp256k1. In rbsecp256k1
+  3.0.0 and later libsecp256k1 is bundled with the gem.
 test_files: []