ffi-libsodium 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ead53faf6d5782f67d70043e224ded1177881f6d
-  data.tar.gz: 51467dd63043a45e209597485caf46994c3ce04e
+  metadata.gz: a64973f4ee49434ae79e0981dedabdade25b65cc
+  data.tar.gz: 903493fc260cb41a5914b796e7e9c01ca593bc5d
 SHA512:
-  metadata.gz: 31b2073dbb29f12e2c45ca3a0579888c4062e17d8e24a553a3d00ac4715b0d783f45be3216cc125e11c5b08718345689cb0e00ce90531462537cdabceeaf90c4
-  data.tar.gz: 1f3b6439bfd1586bb03433b63228cae955f9f4919d54ccce2542c2c8719c21b372569577ca473f0f809bb7f029dee41b8bed08e51442f5db04407c834b39a3a4
+  metadata.gz: c84186666cb598453a1967930137a11d6bdc2ceb8b2b1cc49bdbad37625636aed4859edd860ab772b3d3e0b15cfe65e12f5988dddebf7d9efd8398364e42b92c
+  data.tar.gz: 2f771787c58557835b65687e7ab65d021a981a37058a04be965ce3d64341fb86fcdbb1099d9382164c8fce3cc403e1cce9d7fe96c15b4668f57d8e1108866b26

data/lib/crypto/aead/chacha20_poly1305.rb

@@ -3,7 +3,7 @@ require_relative '../../sodium/utils'
 require_relative '../../random_bytes'
 require_relative '../../sodium/buffer'
 require_relative '../../sodium/secret_buffer'
-require_relative '../../sodium'
+require_relative '../../sodium/errors'
 
 module Crypto
   module AEAD

data/lib/crypto/box.rb

@@ -3,7 +3,7 @@ require_relative '../sodium/utils'
 require_relative '../random_bytes'
 require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'
-require_relative '../sodium'
+require_relative '../sodium/errors'
 
 module Crypto
   module Box
@@ -29,8 +29,8 @@ module Crypto
     attach_function :crypto_box_keypair,      [:buffer_out, :buffer_out],             :int, blocking: true
     attach_function :crypto_box_seed_keypair, [:buffer_out, :buffer_out, :buffer_in], :int, blocking: true
 
-    attach_function :crypto_box_easy,       [:buffer_out, :buffer_in, :ulong_long, :buffer_in, :buffer_in, :buffer_in], :int, blocking: true
-    attach_function :crypto_box_open_easy,  [:buffer_out, :buffer_in, :ulong_long, :buffer_in, :buffer_in, :buffer_in], :int, blocking: true
+    attach_function :crypto_box_easy,         [:buffer_out, :buffer_in, :ulong_long, :buffer_in, :buffer_in, :buffer_in], :int, blocking: true
+    attach_function :crypto_box_open_easy,    [:buffer_out, :buffer_in, :ulong_long, :buffer_in, :buffer_in, :buffer_in], :int, blocking: true
 
     attach_function :crypto_box_beforenm,     [:buffer_out, :buffer_in, :buffer_in],  :int, blocking: true
 
@@ -152,7 +152,7 @@ module Crypto
       check_length(secret_key, SECRETKEYBYTES, :SecretKey)
 
       secret_key.readonly if secret_key.is_a?(Sodium::SecretBuffer)
-      unless crypto_box_open_easy(ciphertext, ciphertext, ciphertext.bytesize, nonce, public_key, secret_key).zero?
+      unless crypto_box_open_easy(ciphertext, ciphertext, get_size(ciphertext), nonce, public_key, secret_key).zero?
         raise Sodium::CryptoError, "Message forged", caller
       end
 

data/lib/crypto/generic_hash.rb

@@ -1,6 +1,6 @@
 require 'ffi'
 require_relative '../sodium/utils'
-require_relative '../sodium'
+require_relative '../sodium/errors'
 require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'
 
@@ -47,7 +47,7 @@ module Crypto
 
     def generichash(message, hash_size = BYTES, key = nil)
       if hash_size > BYTES_MAX ||hash_size < BYTES_MIN
-        fail Sodium::LengthError, "Hash size must be between #{BYTES_MIN} and #{BYTES_MAX} bytes, got size=#{hash_size.to_int} bytes", caller
+        fail Sodium::LengthError, "Hash size must be between #{BYTES_MIN} and #{BYTES_MAX} bytes, got size=#{hash_size} bytes", caller
       end
 
       if key
@@ -84,7 +84,7 @@ module Crypto
       end
 
       if hash_size > BYTES_MAX ||hash_size < BYTES_MIN
-        fail Sodium::LengthError, "Hash size must be between #{BYTES_MIN} and #{BYTES_MAX} bytes, got size=#{hash_size.to_int} bytes", caller
+        fail Sodium::LengthError, "Hash size must be between #{BYTES_MIN} and #{BYTES_MAX} bytes, got size=#{hash_size} bytes", caller
       end
 
       state = State.new

data/lib/crypto/pw_hash/scrypt_salsa208_sha256.rb

@@ -1,7 +1,7 @@
 require 'ffi'
 require_relative '../../sodium/utils'
 require_relative '../../random_bytes'
-require_relative '../../sodium'
+require_relative '../../sodium/errors'
 require_relative '../../sodium/secret_buffer'
 
 module Crypto
@@ -52,15 +52,15 @@ module Crypto
         out = nil
         check_length(salt, SALTBYTES, :Salt)
         if opslimit < OPSLIMIT_INTERACTIVE
-          fail Sodium::LengthError, "Opslimit must be at least #{OPSLIMIT_INTERACTIVE}, got #{opslimit.to_int}", caller
+          fail Sodium::LengthError, "Opslimit must be at least #{OPSLIMIT_INTERACTIVE}, got #{opslimit}", caller
         end
         if memlimit < MEMLIMIT_INTERACTIVE
-          fail Sodium::LengthError, "Memlimit must be at least #{MEMLIMIT_INTERACTIVE}, got #{memlimit.to_int}", caller
+          fail Sodium::LengthError, "Memlimit must be at least #{MEMLIMIT_INTERACTIVE}, got #{memlimit}", caller
         end
 
         out = Sodium::SecretBuffer.new(outlen, PRIMITIVE)
         unless crypto_pwhash_scryptsalsa208sha256(out, outlen, passwd, get_size(passwd), salt, opslimit, memlimit).zero?
-          raise NoMemoryError, "Failed to allocate memory max size=#{memlimit.to_int} bytes", caller
+          raise NoMemoryError, "Failed to allocate memory max size=#{memlimit} bytes", caller
         end
 
         out
@@ -70,15 +70,15 @@ module Crypto
 
       def str(passwd, opslimit = OPSLIMIT_INTERACTIVE, memlimit = MEMLIMIT_INTERACTIVE)
         if opslimit < OPSLIMIT_INTERACTIVE
-          fail Sodium::LengthError, "Opslimit must be at least #{OPSLIMIT_INTERACTIVE}, got #{opslimit.to_int}", caller
+          fail Sodium::LengthError, "Opslimit must be at least #{OPSLIMIT_INTERACTIVE}, got #{opslimit}", caller
         end
         if memlimit < MEMLIMIT_INTERACTIVE
-          fail Sodium::LengthError, "Memlimit must be at least #{MEMLIMIT_INTERACTIVE}, got #{memlimit.to_int}", caller
+          fail Sodium::LengthError, "Memlimit must be at least #{MEMLIMIT_INTERACTIVE}, got #{memlimit}", caller
         end
 
         hashed_password = FFI::MemoryPointer.new(:char, STRBYTES)
         unless crypto_pwhash_scryptsalsa208sha256_str(hashed_password, passwd, get_size(passwd), opslimit, memlimit).zero?
-          raise NoMemoryError, "Failed to allocate memory max size=#{memlimit.to_int} bytes", caller
+          raise NoMemoryError, "Failed to allocate memory max size=#{memlimit} bytes", caller
         end
 
         hashed_password.get_string(0)

data/lib/crypto/secret_box.rb

@@ -87,7 +87,7 @@ module Crypto
       check_length(key, KEYBYTES, :SecretKey)
 
       key.readonly if key.is_a?(Sodium::SecretBuffer)
-      unless crypto_secretbox_open_easy(ciphertext, ciphertext, ciphertext.bytesize, nonce, key).zero?
+      unless crypto_secretbox_open_easy(ciphertext, ciphertext, get_size(ciphertext), nonce, key).zero?
         raise Sodium::CryptoError, "Message forged", caller
       end
 

data/lib/libsodium.rb

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

data/lib/sodium/errors.rb

@@ -0,0 +1,5 @@
+module Sodium
+  class CryptoError < StandardError; end
+  class LengthError < ArgumentError; end
+  class MemoryError < StandardError; end
+end

data/lib/sodium/utils.rb

@@ -1,4 +1,4 @@
-require_relative '../sodium'
+require_relative '../sodium/errors'
 require 'ffi'
 
 module Sodium
@@ -8,16 +8,17 @@ module Sodium
 
     def check_length(data, length, description)
       if data.is_a?(String) ||data.respond_to?(:bytesize)
-        unless data.bytesize == length.to_int
-          fail Sodium::LengthError, "Expected a length=#{length.to_int} bytes #{description}, got size=#{data.bytesize} bytes", caller
+        unless data.bytesize == length
+          fail Sodium::LengthError, "Expected a length=#{length} bytes #{description}, got size=#{data.bytesize} bytes", caller
         end
       elsif data.is_a?(FFI::Pointer) ||data.respond_to?(:size)
-        unless data.size == length.to_int
-          fail Sodium::LengthError, "Expected a length=#{length.to_int} bytes #{description}, got size=#{data.size} bytes", caller
+        unless data.size == length
+          fail Sodium::LengthError, "Expected a length=#{length} bytes #{description}, got size=#{data.size} bytes", caller
         end
       else
-        fail ArgumentError, "#{description} must be of type String or FFI::Pointer and be length=#{length.to_int} bytes long", caller
+        fail ArgumentError, "#{description} must be of type String or FFI::Pointer and be length=#{length} bytes long", caller
       end
+
       true
     end
 

data/lib/sodium/version.rb

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

data/lib/sodium.rb

@@ -1,10 +1,7 @@
 require 'ffi'
+require_relative 'sodium/errors'
 
 module Sodium
-  class CryptoError < StandardError; end
-  class LengthError < ArgumentError; end
-  class MemoryError < StandardError; end
-
   extend FFI::Library
   ffi_lib :libsodium
 
@@ -25,26 +22,26 @@ module Sodium
 
   def mlock(addr, len)
     unless sodium_mlock(addr, len).zero?
-      raise MemoryError, "Could not lock length=#{len.to_int} bytes memory at address=#{addr.address}", caller
+      raise MemoryError, "Could not lock length=#{len} bytes memory at address=#{addr.address}", caller
     end
   end
 
   def munlock(addr, len)
     unless sodium_munlock(addr, len).zero?
-      raise MemoryError, "Could not unlock length=#{len.to_int} bytes memory at address=#{addr.address}", caller
+      raise MemoryError, "Could not unlock length=#{len} bytes memory at address=#{addr.address}", caller
     end
   end
 
   def malloc(size)
     unless (mem = sodium_malloc(size))
-      raise NoMemoryError, "Failed to allocate memory size=#{size.to_int} bytes", caller
+      raise NoMemoryError, "Failed to allocate memory size=#{size} bytes", caller
     end
     mem
   end
 
   def allocarray(count, size)
     unless (mem = sodium_allocarray(count, size))
-      raise NoMemoryError, "Failed to allocate memory size=#{count.to_int * size.to_int} bytes", caller
+      raise NoMemoryError, "Failed to allocate memory size=#{count * size} bytes", caller
     end
     mem
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libsodium
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Hendrik Beskow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2014-12-07 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/errors.rb
 - lib/sodium/secret_buffer.rb
 - lib/sodium/utils.rb
 - lib/sodium/version.rb