blake2b_rs 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6be97419891922570b5b97e14e781d7a1bc957f03d543f4c7a1a0806e3f925d
-  data.tar.gz: 07d4a203d944db9f2623712ae3e22a8a66d181aa639a2b8fca132e733ac338f1
+  metadata.gz: 1efeab05937eaf481f8b8cf29f089e87a163a7b2b7bd01700ef404c818a80992
+  data.tar.gz: 57bac7eb73edaf73c12ba5d1514514cb9fbfe50c5ae335155ae4163d57661e11
 SHA512:
-  metadata.gz: 158c8dcbab1a2b227e0377a06036093c6a3175c7fd6d6f4cb8b9a3939f909360d09578ab3a73609d827350f32cb58f00c156550805d8cfba51f50ef49a639345
-  data.tar.gz: 59055f7d7b2802e0ecb27a0961cdfcedbe214202662b29156b1f89fc421c58f756e33fd1fc8a5aef9259dfc9dc75597a0e2bacb8ff4c542e1cc5676d20488568
+  metadata.gz: 7b81a7f9d5d2e02a50e337c7144bd9152f747b882e602b615462675398fb84cc063d28fa63b66d01f67096db2e82edc24a8c65bff79497b77a258564cc2cb6c7
+  data.tar.gz: fd1402ae62998ea33ce953094ada3aabc8dc15cb44578a1648b4de0c65251199c33767b143c23b3fb924d7b50f0e04a48e663389aefcaa9449cac694f226dbb8

data/.gitignore

@@ -14,3 +14,4 @@
 # Added by cargo
 
 /target
+/mkmf.log

data/Cargo.lock

@@ -17,6 +17,7 @@ version = "0.1.0"
 dependencies = [
  "blake2",
  "hex",
+ "libc",
 ]
 
 [[package]]
@@ -54,6 +55,12 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "libc"
+version = "0.2.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba4aede83fc3617411dc6993bc8c70919750c1c257c6ca6a502aed6e0e2394ae"
+
 [[package]]
 name = "opaque-debug"
 version = "0.3.0"

data/Cargo.toml

@@ -9,6 +9,7 @@ edition = "2018"
 [dependencies]
 blake2 = "0.9"
 hex = "0.4.3"
+libc = "0.2.90"
 
 [lib]
 crate-type=["dylib"]

data/Gemfile.lock

@@ -1,14 +1,16 @@
 PATH
   remote: .
   specs:
-    blake2b_rs (0.1.1)
+    blake2b_rs (0.1.2)
       ffi (= 1.15.0)
+      thermite (~> 0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.4.4)
     ffi (1.15.0)
+    minitar (0.9)
     rake (12.3.3)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -23,6 +25,11 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
+    thermite (0.13.0)
+      minitar (~> 0.5)
+      rake (>= 10)
+      tomlrb (~> 1.2)
+    tomlrb (1.3.0)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -1,6 +1,11 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'thermite/tasks'
 
-RSpec::Core::RakeTask.new(:spec)
+Thermite::Tasks.new
 
-task :default => :spec
+task default: %w(thermite:build)
+
+desc 'Run Rust & Ruby testsuites'
+task test: ['thermite:build', 'thermite:test'] do
+
+end

data/blake2b.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Aki Wu"]
   spec.email         = ["wuminzhe@gmail.com"]
 
-  spec.summary       = %q{Blake2b from rust}
-  spec.description   = %q{Blake2b from rust}
+  spec.summary       = %q{A ruby blake2b gem which using rust blake2 crate}
+  spec.description   = %q{A ruby blake2b gem which using rust blake2 crate}
   spec.homepage      = "https://github.com/wuminzhe/blake2b"
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
@@ -25,5 +25,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.extensions << 'ext/Rakefile'
+
+  spec.add_runtime_dependency 'thermite', '~> 0'
+
   spec.add_dependency "ffi", "1.15.0"
 end

data/ext/Rakefile

@@ -0,0 +1,5 @@
+require 'thermite/tasks'
+
+project_dir = File.dirname(File.dirname(__FILE__))
+Thermite::Tasks.new(cargo_project_path: project_dir, ruby_project_path: project_dir)
+task default: %w(thermite:build)

data/lib/blake2b.rb

@@ -1,17 +1,39 @@
 require "blake2b/version"
 require 'ffi'
 
+class Str < FFI::AutoPointer
+  def self.release(ptr)
+    Blake2b.free(ptr)
+  end
+
+  def to_s
+    @str ||= self.read_string.force_encoding('UTF-8')
+  end
+end
+
 module Blake2b
   class Error < StandardError; end
 
   extend FFI::Library
-  ffi_lib "target/debug/libblake2b." + FFI::Platform::LIBSUFFIX
-  attach_function :rust_blake2b, %i[pointer int int], :string
+  ffi_lib "#{__dir__}/../target/release/libblake2b." + FFI::Platform::LIBSUFFIX
+  attach_function :rust_blake2b, %i[pointer int int], Str
 
   def self.hex(u8a, out_len=32)
     c = FFI::MemoryPointer.new(:int8, u8a.size)
     c.write_array_of_int8 u8a
 
-    self.rust_blake2b(c, c.size, out_len)
+    self.rust_blake2b(c, c.size, out_len).to_s
+  end
+
+  def self.blake2b160(u8a)
+    self.hex(u8a, 20)
+  end
+
+  def self.blake2b256(u8a)
+    self.hex(u8a, 32)
+  end
+
+  def self.blake2b512(u8a)
+    self.hex(u8a, 64)
   end
 end

data/lib/blake2b/version.rb

@@ -1,3 +1,3 @@
 module Blake2b
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/src/lib.rs

@@ -1,6 +1,8 @@
 use std::slice;
 use blake2::VarBlake2b;
 use blake2::digest::{Update, VariableOutput};
+use libc::c_char;
+use std::ffi::CString;
 
 fn to_u8_vec(pointer: *const u8, len: usize) -> Vec<u8> {
 	let data_slice = unsafe {
@@ -11,13 +13,15 @@ fn to_u8_vec(pointer: *const u8, len: usize) -> Vec<u8> {
 }
 
 #[no_mangle]
-pub extern fn rust_blake2b(p: *const u8, len: usize, out_len: usize) -> *const u8{
+pub extern fn rust_blake2b(p: *const u8, len: usize, out_len: usize) -> *mut c_char{
 	let data = to_u8_vec(p, len);
 	let mut hasher = VarBlake2b::new(out_len).unwrap();
 	hasher.update(&data);
 	let mut result = vec![0u8; out_len];
 	hasher.finalize_variable(|res| {
-		result.copy_from_slice(res);
+		result[0..out_len].copy_from_slice(res);
 	});
-	hex::encode(result).as_ptr()
+	let s = hex::encode(result);
+	let c_str = CString::new(s).unwrap();
+	c_str.into_raw()
 }

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: blake2b_rs
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Aki Wu
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-19 00:00:00.000000000 Z
+date: 2021-03-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thermite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -24,11 +38,12 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.15.0
-description: Blake2b from rust
+description: A ruby blake2b gem which using rust blake2 crate
 email:
 - wuminzhe@gmail.com
 executables: []
-extensions: []
+extensions:
+- ext/Rakefile
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -45,6 +60,7 @@ files:
 - bin/console
 - bin/setup
 - blake2b.gemspec
+- ext/Rakefile
 - lib/blake2b.rb
 - lib/blake2b/version.rb
 - src/lib.rs
@@ -54,7 +70,7 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org/
   homepage_uri: https://github.com/wuminzhe/blake2b
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -70,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key:
+signing_key: 
 specification_version: 4
-summary: Blake2b from rust
+summary: A ruby blake2b gem which using rust blake2 crate
 test_files: []