ffi-libsodium 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95a7d9bb37cc560f3dfbb7a72a6bcf31ffdf63d6
-  data.tar.gz: 636823f16c86f508ff3180c56edb357a6b8afa2c
+  metadata.gz: 0b54d280d3fdd22d6572b1eed77f44a3c7566091
+  data.tar.gz: abdbaaa5de78cc99f1cb9a26044e5ba4514e0127
 SHA512:
-  metadata.gz: e101ac68e41004c5b1dab8594baf37a6bd3c68fa6bb4981fdc556ef7d6d9cfac3e5aadaaec9c4ff11c524570fcf49500459aca5eed2486c8af7835235a0a5b61
-  data.tar.gz: 9c3e394cdf2941d370ad3c690c0bf17a335ba4cc9aba9aea5fa61b88bdff986369493be2348aa3d6663fff6e6e98c3aa6901d5fbefd5b59a5d3893f5bc696fa1
+  metadata.gz: 2ead290d9a7cfdc44bf9184d5ac2245e9af185d53d7ce34588afa63b7438204a53521b43a136ed394bfe6193d68949932d7656fa1a1fdc8cf0a71bd3f88435fd
+  data.tar.gz: 6e9dedb63914e6287f3ba27f5a3d6a970a04f0c297f60ee6938831cbe58b979fa75c7660bc9c3d37b0f47d13729a8a1abc2a29580cd07aaa5a909a72f086f696

data/lib/crypto/box.rb

@@ -130,7 +130,7 @@ module Crypto
       secret_key.noaccess if secret_key.is_a?(Sodium::SecretBuffer)
     end
 
-    def open_easy_in_place(data, nonce, public_key, secret_key, encoding = false)
+    def open_easy_in_place(data, nonce, public_key, secret_key, encoding = nil)
       ciphertext = String(data)
       ciphertext_len = ciphertext.bytesize
       if (message_len = ciphertext_len - MACBYTES) > 0

data/lib/crypto/secret_box.rb

@@ -76,7 +76,7 @@ module Crypto
       key.noaccess if key.is_a?(Sodium::SecretBuffer)
     end
 
-    def open_easy_in_place(data, nonce, key, encoding = false)
+    def open_easy_in_place(data, nonce, key, encoding = nil)
       ciphertext = String(data)
       ciphertext_len = ciphertext.bytesize
       if (message_len = ciphertext_len - MACBYTES) > 0

data/lib/libsodium.rb

@@ -1,4 +1,5 @@
-require_relative 'sodium/errors'
+require_relative 'sodium/core_ext'
+require_relative 'sodium/errors'
 require_relative 'sodium'
 require_relative 'sodium/utils'
 require_relative 'sodium/buffer'

data/lib/sodium.rb

@@ -1,7 +1,5 @@
 require 'ffi'
 require_relative 'sodium/errors'
-require_relative 'sodium/utils'
-require_relative 'sodium/buffer'
 
 module Sodium
   extend FFI::Library

data/lib/sodium/core_ext.rb

@@ -0,0 +1,5 @@
+class NilClass
+  def size
+    0
+  end
+end

data/lib/sodium/mprotect.rb

@@ -1,6 +1,5 @@
 require 'ffi'
 require_relative 'errors'
-require_relative 'utils'
 
 module Sodium
   module Mprotect

data/lib/sodium/utils.rb

@@ -1,5 +1,4 @@
-require 'ffi'
-require_relative 'secret_buffer'
+require_relative 'core_ext'
 require_relative 'errors'
 
 module Sodium
@@ -8,34 +7,18 @@ module Sodium
     module_function
 
     def get_size(data)
-      case data
-      when FFI::Pointer, SecretBuffer
-        data.size
-      when String
+      if data.respond_to?(:bytesize)
         data.bytesize
-      when NilClass
-        0
       else
-        fail TypeError, "#{data.class} must be of type FFI::Pointer, Sodium::SecretBufffer, String or NilClass", caller
+        data.size
       end
     end
 
     def check_length(data, length, description)
-      case data
-      when FFI::Pointer, SecretBuffer
-        if data.size == length
-          true
-        else
-          fail LengthError, "Expected a length=#{length} bytes #{description}, got size=#{data.size} bytes", caller
-        end
-      when String
-        if data.bytesize == length
-          true
-        else
-          fail LengthError, "Expected a length=#{length} bytes #{description}, got size=#{data.bytesize} bytes", caller
-        end
+      if data.respond_to?(:bytesize)
+        data.bytesize == length || fail(LengthError, "Expected a length=#{length} bytes #{description}, got size=#{data.bytesize} bytes", caller)
       else
-        fail TypeError, "#{data.class} must be of type FFI::Pointer, Sodium::SecretBufffer or String", caller
+        data.size == length || fail(LengthError, "Expected a length=#{length} bytes #{description}, got size=#{data.size} bytes", caller)
       end
     end
 
@@ -48,11 +31,11 @@ module Sodium
     HEXY = 'H*'.freeze
 
     def bin2hex(bytes)
-      bytes.to_str.unpack(HEXY).first
+      String(bytes).unpack(HEXY).first
     end
 
     def hex2bin(hex)
-      [hex].pack(HEXY)
+      [String(hex)].pack(HEXY)
     end
   end
 

data/lib/sodium/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libsodium
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Hendrik Beskow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -61,6 +61,7 @@ files:
 - lib/random_bytes.rb
 - lib/sodium.rb
 - lib/sodium/buffer.rb
+- lib/sodium/core_ext.rb
 - lib/sodium/errors.rb
 - lib/sodium/mprotect.rb
 - lib/sodium/secret_buffer.rb