ffi-libsodium 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c81230a67614e1616d64c30e469947b9131a72ac
-  data.tar.gz: 228b1201f0b00119fba63b04ccdd7a2f88fcc77e
+  metadata.gz: 87db0771703338d8f1f2af7e6e0b4fa97bf16340
+  data.tar.gz: 5362403aea2592d3b09b56f2051ea93424635d57
 SHA512:
-  metadata.gz: d36f6b18d630b803b43cd094647ac5c332f599ab668c5df340ac02237742cc91770b644b2030db00e3611d975b10afd3ec10e9752ecac92dc781e9e560d8c5e6
-  data.tar.gz: 0b54875b9bc202e53714a8be00078e847843c4e255902e82aacf3f464d55cd6256a36559de82a1bf1d088b51a073277a6175d1788f23f314381004b3c985d30d
+  metadata.gz: 8c87f61dc009dd14d49f18d78a9f7f50ead03d972b0d08e87bc7f81d2c6b2e4cc66234e6402cf57f231607ada0ba0f01c0b4b0bb6a63cd213df4e21afdf16678
+  data.tar.gz: 33d8c50b5575fc148f215f26f1cd108fd4dbebfef6a7c4a613bd465e944652b1d0d746baefeaa7dadc3b7f54790bef7e84ef7c159455cc0358be7c8d3a824db7

data/lib/sodium.rb

@@ -1,8 +1,11 @@
 require 'ffi'
 require_relative 'sodium/errors'
+require_relative 'sodium/utils'
+require_relative 'sodium/buffer'
 
 module Sodium
   extend FFI::Library
+  extend Utils
   ffi_lib :libsodium
 
   attach_function :init,  :sodium_init, [], :int
@@ -15,6 +18,9 @@ module Sodium
   attach_function :sodium_malloc,             [:size_t],            :pointer
   attach_function :sodium_allocarray,         [:size_t, :size_t],   :pointer
 
+  attach_function :sodium_bin2hex,  [:buffer_out, :size_t, :buffer_in, :size_t],  :string
+  attach_function :sodium_hex2bin,  [:buffer_out, :size_t, :buffer_in, :size_t, :string, :pointer, :pointer],  :int
+
   module_function
 
   def mlock(addr, len)
@@ -32,4 +38,22 @@ module Sodium
   def allocarray(count, size)
     sodium_allocarray(count, size) || raise(NoMemoryError, "Failed to allocate memory size=#{count * size} bytes", caller)
   end
+
+  def bin2hex(bin)
+    bin_len = get_size(bin)
+    hex = FFI::MemoryPointer.new(:char, bin_len * 2 + 1)
+    sodium_bin2hex(hex, hex.size, bin, bin_len)
+  end
+
+  def hex2bin(hex, ignore = nil)
+    if ignore
+      bin_maxlen = hex.tr(ignore, '').bytesize / 2
+    else
+      bin_maxlen = hex.bytesize / 2
+    end
+
+    bin = Sodium::Buffer.new(:uchar, bin_maxlen)
+    sodium_hex2bin(bin, bin_maxlen, hex, hex.bytesize, ignore, nil, nil)
+    bin
+  end
 end

data/lib/sodium/version.rb

@@ -1,3 +1,3 @@
 module Sodium
-  VERSION = Gem::Version.new('0.2.3')
+  VERSION = Gem::Version.new('0.2.4')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libsodium
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Hendrik Beskow