ffi-libsodium 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87db0771703338d8f1f2af7e6e0b4fa97bf16340
-  data.tar.gz: 5362403aea2592d3b09b56f2051ea93424635d57
+  metadata.gz: 098cc9a2b79fd39389f77241c75bc2e03efb0461
+  data.tar.gz: e1ae4db97427751f2eb56d9081c30a3a7791604b
 SHA512:
-  metadata.gz: 8c87f61dc009dd14d49f18d78a9f7f50ead03d972b0d08e87bc7f81d2c6b2e4cc66234e6402cf57f231607ada0ba0f01c0b4b0bb6a63cd213df4e21afdf16678
-  data.tar.gz: 33d8c50b5575fc148f215f26f1cd108fd4dbebfef6a7c4a613bd465e944652b1d0d746baefeaa7dadc3b7f54790bef7e84ef7c159455cc0358be7c8d3a824db7
+  metadata.gz: be3aa678237413491b999b89dc66d93a4567fed6a01be67e197844f92e4aa9dc4e3a58dc506eac54731ab117ca5501e04caa665332902477531e3fb6a097195a
+  data.tar.gz: 15f1532694c26a4b2ec4bd04c64c25805e1f9c9a9d688aee75b1ac92142876a7ab4cd8bbd483a869375b36eda66429e82f3e680e5f663df752a60625283a7a75

data/lib/sodium.rb

@@ -24,19 +24,35 @@ module Sodium
   module_function
 
   def mlock(addr, len)
-    sodium_mlock(addr, len) == 0 || raise(MemoryError, "Could not lock length=#{len} bytes memory at address=#{addr.address}", caller)
+    if sodium_mlock(addr, len) == 0
+      true
+    else
+      raise MemoryError, "Could not lock length=#{len} bytes memory at address=#{addr.address}", caller
+    end
   end
 
   def munlock(addr, len)
-    sodium_munlock(addr, len) == 0 || raise(MemoryError, "Could not unlock length=#{len} bytes memory at address=#{addr.address}", caller)
+    if sodium_munlock(addr, len) == 0
+      true
+    else
+      raise MemoryError, "Could not unlock length=#{len} bytes memory at address=#{addr.address}", caller
+    end
   end
 
   def malloc(size)
-    sodium_malloc(size) || raise(NoMemoryError, "Failed to allocate memory size=#{size} bytes", caller)
+    unless (mem = sodium_malloc(size)).null?
+      mem
+    else
+      raise NoMemoryError, "Failed to allocate memory size=#{size} bytes", caller
+    end
   end
 
   def allocarray(count, size)
-    sodium_allocarray(count, size) || raise(NoMemoryError, "Failed to allocate memory size=#{count * size} bytes", caller)
+    unless (mem = sodium_allocarray(count, size)).null?
+      mem
+    else
+      raise NoMemoryError, "Failed to allocate memory size=#{count * size} bytes", caller
+    end
   end
 
   def bin2hex(bin)
@@ -45,15 +61,12 @@ module Sodium
     sodium_bin2hex(hex, hex.size, bin, bin_len)
   end
 
-  def hex2bin(hex, ignore = nil)
-    if ignore
-      bin_maxlen = hex.tr(ignore, '').bytesize / 2
+  def hex2bin(hex, bin_maxlen, ignore = nil)
+    bin = Sodium::Buffer.new(:uchar, bin_maxlen)
+    if sodium_hex2bin(bin, bin_maxlen, hex, hex.bytesize, ignore, nil, nil) == 0
+      bin
     else
-      bin_maxlen = hex.bytesize / 2
+      raise LengthError, "bin_maxlen=#{bin_maxlen} is too short", caller
     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.4')
+  VERSION = Gem::Version.new('0.2.5')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libsodium
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Hendrik Beskow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi