ffi-libsodium 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a6a2df052bb5ae7911a6a64e73ac841dcc3dd4b
-  data.tar.gz: ffedb95aafff7017b363bad6bc1da3fd7ee5437b
+  metadata.gz: 74a7166738e41a800aaf12b433c2f05f32ea032d
+  data.tar.gz: 7a0988313333e6174878ef6f9b39584dc4503139
 SHA512:
-  metadata.gz: e3d63913ef97e34ed10a3a341ca1da67a54d0fbdc797f1c56495591b10b145811d97c480def4a471c9fba29ec2bca34bf78c4e88363cac0cb89592534074c759
-  data.tar.gz: d4ce9e3f910a6c1690bff8ce0c9f428824caeb517e90622cbe36847737c2119f73d668af15367ce54a95af6211bc8cbbcde0fd30b2c26b3166a6d97970d2208e
+  metadata.gz: e131be5dcf2e7963ca0795773fdb823bab55ba89fc60475dc11637ef7ef1bb86dfaceac5213f0c02c7f317d997f3372c4c734f70cc00c1e213c76b011cd65969
+  data.tar.gz: 89a7331b233909cb01f4de635b91c34e253a4efb0958a03821ec3b97dd609cfe8f9a8588e0dca6ada99e79e77260e244f47ccd996cd1de04a8cab02e6e05fdb9

data/lib/crypto/aead/chacha20_poly1305.rb

@@ -1,7 +1,6 @@
 require 'ffi'
 require_relative '../../sodium/utils'
 require_relative '../../random_bytes'
-require_relative '../../sodium/buffer'
 require_relative '../../sodium/secret_buffer'
 require_relative '../../sodium/errors'
 
@@ -45,7 +44,7 @@ module Crypto
         check_length(nonce, NPUBBYTES, :Nonce)
         check_length(key, KEYBYTES, :SecretKey)
 
-        ciphertext = Sodium::Buffer.new(:uchar, message_len + ABYTES)
+        ciphertext = zeros(message_len + ABYTES)
         key.readonly if key.is_a?(Sodium::SecretBuffer)
         crypto_aead_chacha20poly1305_encrypt(ciphertext, nil, message, message_len, additional_data, get_size(additional_data), nil, nonce, key)
 
@@ -60,7 +59,7 @@ module Crypto
           check_length(nonce, NPUBBYTES, :Nonce)
           check_length(key, KEYBYTES, :SecretKey)
 
-          decrypted = Sodium::Buffer.new(:uchar, decrypted_len)
+          decrypted = zeros(decrypted_len)
           key.readonly if key.is_a?(Sodium::SecretBuffer)
           if crypto_aead_chacha20poly1305_decrypt(decrypted, nil, nil, ciphertext, ciphertext_len, additional_data, get_size(additional_data), nonce, key) == 0
             decrypted

data/lib/crypto/auth.rb

@@ -1,6 +1,5 @@
 require 'ffi'
 require_relative '../sodium/utils'
-require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'
 
 module Crypto
@@ -26,7 +25,7 @@ module Crypto
     def auth(message, key)
       check_length(key, KEYBYTES, :SecretKey)
 
-      mac = Sodium::Buffer.new(:uchar, BYTES)
+      mac = zeros(BYTES)
       key.readonly if key.is_a?(Sodium::SecretBuffer)
       crypto_auth(mac, message, get_size(message), key)
 

data/lib/crypto/box.rb

@@ -1,7 +1,6 @@
 require 'ffi'
 require_relative '../sodium/utils'
 require_relative '../random_bytes'
-require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'
 require_relative '../sodium/errors'
 
@@ -39,8 +38,8 @@ module Crypto
     end
 
     def keypair
-      public_key = Sodium::Buffer.new(:uchar, PUBLICKEYBYTES)
-      secret_key = Sodium::Buffer.new(:uchar, SECRETKEYBYTES)
+      public_key = zeros(PUBLICKEYBYTES)
+      secret_key = zeros(SECRETKEYBYTES)
       crypto_box_keypair(public_key, secret_key)
 
       [public_key, secret_key]
@@ -49,8 +48,8 @@ module Crypto
     def seed_keypair(seed)
       check_length(seed, SEEDBYTES, :Seed)
 
-      public_key = Sodium::Buffer.new(:uchar, PUBLICKEYBYTES)
-      secret_key = Sodium::Buffer.new(:uchar, SECRETKEYBYTES)
+      public_key = zeros(PUBLICKEYBYTES)
+      secret_key = zeros(SECRETKEYBYTES)
       seed.readonly if seed.is_a?(Sodium::SecretBuffer)
       crypto_box_seed_keypair(public_key, secret_key, seed)
 
@@ -60,7 +59,7 @@ module Crypto
     end
 
     def memory_locked_keypair
-      public_key = Sodium::Buffer.new(:uchar, PUBLICKEYBYTES)
+      public_key = zeros(PUBLICKEYBYTES)
       secret_key = Sodium::SecretBuffer.new(SECRETKEYBYTES)
       crypto_box_keypair(public_key, secret_key)
       secret_key.noaccess
@@ -71,7 +70,7 @@ module Crypto
     def memory_locked_seed_keypair(seed)
       check_length(seed, SEEDBYTES, :Seed)
 
-      public_key = Sodium::Buffer.new(:uchar, PUBLICKEYBYTES)
+      public_key = zeros(PUBLICKEYBYTES)
       secret_key = Sodium::SecretBuffer.new(SECRETKEYBYTES)
       seed.readonly if seed.is_a?(Sodium::SecretBuffer)
       crypto_box_seed_keypair(public_key, secret_key, seed)
@@ -88,7 +87,7 @@ module Crypto
       check_length(public_key, PUBLICKEYBYTES, :PublicKey)
       check_length(secret_key, SECRETKEYBYTES, :SecretKey)
 
-      ciphertext = Sodium::Buffer.new(:uchar, message_len + MACBYTES)
+      ciphertext = zeros(message_len + MACBYTES)
       secret_key.readonly if secret_key.is_a?(Sodium::SecretBuffer)
       crypto_box_easy(ciphertext, message, message_len, nonce, public_key, secret_key)
 
@@ -103,7 +102,7 @@ module Crypto
       check_length(public_key, PUBLICKEYBYTES, :PublicKey)
       check_length(secret_key, SECRETKEYBYTES, :SecretKey)
 
-      decrypted = Sodium::Buffer.new(:uchar, ciphertext_len - MACBYTES)
+      decrypted = zeros(ciphertext_len - MACBYTES)
       secret_key.readonly if secret_key.is_a?(Sodium::SecretBuffer)
       if crypto_box_open_easy(decrypted, ciphertext, ciphertext_len, nonce, public_key, secret_key) == 0
         decrypted

data/lib/crypto/generic_hash.rb

@@ -1,6 +1,5 @@
 require 'ffi'
 require_relative '../sodium/utils'
-require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'
 require_relative '../sodium/errors'
 
@@ -52,7 +51,7 @@ module Crypto
         key_len = 0
       end
 
-      blake2b = Sodium::Buffer.new(:uchar, hash_size)
+      blake2b = zeros(hash_size)
       key.readonly if key.is_a?(Sodium::SecretBuffer)
       if crypto_generichash(blake2b, hash_size, message, get_size(message), key, key_len) == 0
         blake2b
@@ -73,7 +72,7 @@ module Crypto
       state = State.new
       key.readonly if key.is_a?(Sodium::SecretBuffer)
       if crypto_generichash_init(state, key, key_len, hash_size) == 0
-        [state, Sodium::Buffer.new(:uchar, hash_size)]
+        [state, zeros(hash_size)]
       else
         raise Sodium::CryptoError
       end
@@ -86,7 +85,7 @@ module Crypto
     end
 
     def final(state, blake2b)
-      if crypto_generichash_final(state, blake2b, blake2b.size) == 0
+      if crypto_generichash_final(state, blake2b, blake2b.bytesize) == 0
         blake2b
       else
         raise Sodium::CryptoError

data/lib/crypto/one_time_auth.rb

@@ -1,6 +1,5 @@
 require 'ffi'
 require_relative '../sodium/utils'
-require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'
 
 module Crypto
@@ -35,7 +34,7 @@ module Crypto
     def onetimeauth(message, key)
       check_length(key, KEYBYTES, :SecretKey)
 
-      out = Sodium::Buffer.new(:uchar, BYTES)
+      out = zeros(BYTES)
       key.readonly if key.is_a?(Sodium::SecretBuffer)
       crypto_onetimeauth(out, message, get_size(message), key)
 
@@ -71,7 +70,7 @@ module Crypto
     end
 
     def final(state)
-      out = Sodium::Buffer.new(:uchar, BYTES)
+      out = zeros(BYTES)
       crypto_onetimeauth_final(state, out)
       out
     end

data/lib/crypto/pw_hash/scrypt_salsa208_sha256.rb

@@ -61,9 +61,9 @@ module Crypto
       end
 
       def str(passwd, opslimit = OPSLIMIT_INTERACTIVE, memlimit = MEMLIMIT_INTERACTIVE)
-        hashed_password = FFI::MemoryPointer.new(:char, STRBYTES)
+        hashed_password = zeros(STRBYTES - 1)
         if crypto_pwhash_scryptsalsa208sha256_str(hashed_password, passwd, passwd.bytesize, opslimit, memlimit) == 0
-          hashed_password.get_string(0)
+          hashed_password
         else
           raise NoMemoryError, "Failed to allocate memory max size=#{memlimit} bytes", caller
         end

data/lib/crypto/scalar_mult.rb

@@ -1,6 +1,5 @@
 require 'ffi'
 require_relative '../sodium/utils'
-require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'
 
 module Crypto
@@ -26,7 +25,7 @@ module Crypto
     def base(secret_key)
       check_length(secret_key, SCALARBYTES, :SecretKey)
 
-      public_key = Sodium::Buffer.new(:uchar, BYTES)
+      public_key = zeros(BYTES)
       secret_key.readonly if secret_key.is_a?(Sodium::SecretBuffer)
       crypto_scalarmult_base(public_key, secret_key)
 

data/lib/crypto/secret_box.rb

@@ -1,7 +1,6 @@
 require 'ffi'
 require_relative '../sodium/utils'
 require_relative '../random_bytes'
-require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'
 require_relative '../sodium'
 
@@ -36,7 +35,7 @@ module Crypto
       check_length(nonce, NONCEBYTES, :Nonce)
       check_length(key, KEYBYTES, :SecretKey)
 
-      ciphertext = Sodium::Buffer.new(:uchar, message_len + MACBYTES)
+      ciphertext = zeros(message_len + MACBYTES)
       key.readonly if key.is_a?(Sodium::SecretBuffer)
       crypto_secretbox_easy(ciphertext, message, message_len, nonce, key)
 
@@ -50,7 +49,7 @@ module Crypto
       check_length(nonce, NONCEBYTES, :Nonce)
       check_length(key, KEYBYTES, :SecretKey)
 
-      decrypted = Sodium::Buffer.new(:uchar, ciphertext_len - MACBYTES)
+      decrypted = zeros(ciphertext_len - MACBYTES)
       key.readonly if key.is_a?(Sodium::SecretBuffer)
       if crypto_secretbox_open_easy(decrypted, ciphertext, ciphertext_len, nonce, key) == 0
         decrypted

data/lib/crypto/short_hash.rb

@@ -1,6 +1,5 @@
 require 'ffi'
 require_relative '../sodium/utils'
-require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'
 
 module Crypto
@@ -25,7 +24,7 @@ module Crypto
     def shorthash(short_data, key)
       check_length(key, KEYBYTES, :SecretKey)
 
-      siphash = Sodium::Buffer.new(:uchar, BYTES)
+      siphash = zeros(BYTES)
       key.readonly if key.is_a?(Sodium::SecretBuffer)
       crypto_shorthash(siphash, short_data, get_size(short_data), key)
 

data/lib/crypto/sign.rb

@@ -1,6 +1,5 @@
 require 'ffi'
 require_relative '../sodium/utils'
-require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'
 require_relative '../sodium'
 
@@ -32,8 +31,8 @@ module Crypto
     module_function
 
     def keypair
-      public_key = Sodium::Buffer.new(:uchar, PUBLICKEYBYTES)
-      secret_key = Sodium::Buffer.new(:uchar, SECRETKEYBYTES)
+      public_key = zeros(PUBLICKEYBYTES)
+      secret_key = zeros(SECRETKEYBYTES)
       crypto_sign_keypair(public_key, secret_key)
 
       [public_key, secret_key]
@@ -42,8 +41,8 @@ module Crypto
     def seed_keypair(seed)
       check_length(seed, SEEDBYTES, :Seed)
 
-      public_key = Sodium::Buffer.new(:uchar, PUBLICKEYBYTES)
-      secret_key = Sodium::Buffer.new(:uchar, SECRETKEYBYTES)
+      public_key = zeros(PUBLICKEYBYTES)
+      secret_key = zeros(SECRETKEYBYTES)
       seed.readonly if seed.is_a?(Sodium::SecretBuffer)
       crypto_sign_seed_keypair(public_key, secret_key, seed)
 
@@ -53,7 +52,7 @@ module Crypto
     end
 
     def memory_locked_keypair
-      public_key = Sodium::Buffer.new(:uchar, PUBLICKEYBYTES)
+      public_key = zeros(PUBLICKEYBYTES)
       secret_key = Sodium::SecretBuffer.new(SECRETKEYBYTES)
       crypto_sign_keypair(public_key, secret_key)
       secret_key.noaccess
@@ -64,7 +63,7 @@ module Crypto
     def memory_locked_seed_keypair(seed)
       check_length(seed, SEEDBYTES, :Seed)
 
-      public_key = Sodium::Buffer.new(:uchar, PUBLICKEYBYTES)
+      public_key = zeros(PUBLICKEYBYTES)
       secret_key = Sodium::SecretBuffer.new(SECRETKEYBYTES)
       seed.readonly if seed.is_a?(Sodium::SecretBuffer)
       crypto_sign_seed_keypair(public_key, secret_key, seed)
@@ -79,7 +78,7 @@ module Crypto
       message_len = get_size(message)
       check_length(secret_key, SECRETKEYBYTES, :SecretKey)
 
-      sealed_message = Sodium::Buffer.new(:uchar, message_len + BYTES)
+      sealed_message = zeros(message_len + BYTES)
       secret_key.readonly if secret_key.is_a?(Sodium::SecretBuffer)
       crypto_sign(sealed_message, nil, message, message_len, secret_key)
 
@@ -92,7 +91,7 @@ module Crypto
       sealed_message_len = get_size(sealed_message)
       check_length(public_key, PUBLICKEYBYTES, :PublicKey)
 
-      unsealed_message = Sodium::Buffer.new(:uchar, sealed_message_len - BYTES)
+      unsealed_message = zeros(sealed_message_len - BYTES)
       unsealed_message_len = FFI::MemoryPointer.new(:ulong_long)
       if crypto_sign_open(unsealed_message, unsealed_message_len, sealed_message, sealed_message_len, public_key) == 0
         unsealed_message

data/lib/crypto/sign/ed25519.rb

@@ -1,7 +1,6 @@
 require 'ffi'
 require_relative '../../sodium/utils'
 require_relative '../scalar_mult'
-require_relative '../../sodium/buffer'
 require_relative '../../sodium/secret_buffer'
 
 module Crypto
@@ -35,7 +34,7 @@ module Crypto
       def pk_to_curve25519(public_key)
         check_length(public_key, PUBLICKEYBYTES, :PublicKey)
 
-        curve25519_pk = Sodium::Buffer.new(:uchar, ScalarMult::BYTES)
+        curve25519_pk = zeros(ScalarMult::BYTES)
         crypto_sign_ed25519_pk_to_curve25519(curve25519_pk, public_key)
 
         curve25519_pk

data/lib/libsodium.rb

@@ -2,7 +2,6 @@
 require_relative 'sodium/errors'
 require_relative 'sodium'
 require_relative 'sodium/utils'
-require_relative 'sodium/buffer'
 require_relative 'sodium/mprotect'
 require_relative 'sodium/secret_buffer'
 Sodium.freeze

data/lib/random_bytes.rb

@@ -1,8 +1,9 @@
 require 'ffi'
-require_relative 'sodium/buffer'
+require_relative 'sodium/utils'
 
 module RandomBytes
   extend FFI::Library
+  extend Sodium::Utils
   ffi_lib :libsodium
 
   attach_function :randombytes_buf, [:buffer_out, :size_t], :void
@@ -15,7 +16,7 @@ module RandomBytes
   module_function
 
   def buf(size)
-    buf = Sodium::Buffer.new(:void, size)
+    buf = zeros(size)
     randombytes_buf(buf, size)
     buf
   end

data/lib/sodium.rb

@@ -1,7 +1,6 @@
 require 'ffi'
 require_relative 'sodium/errors'
 require_relative 'sodium/utils'
-require_relative 'sodium/buffer'
 
 module Sodium
   extend FFI::Library
@@ -57,12 +56,12 @@ module Sodium
 
   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)
+    hex = zeros(bin_len * 2)
+    sodium_bin2hex(hex, hex.bytesize, bin, bin_len)
   end
 
   def hex2bin(hex, bin_maxlen, ignore = nil)
-    bin = Sodium::Buffer.new(:uchar, bin_maxlen)
+    bin = zeros(bin_maxlen)
     bin_len = FFI::MemoryPointer.new(:size_t)
     if sodium_hex2bin(bin, bin_maxlen, hex, hex.bytesize, ignore, bin_len, nil) == 0
       size = bin_len.size == 8 ? bin_len.get_uint64(0) : bin_len.get_uint32(0)

data/lib/sodium/version.rb

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

metadata

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

data/lib/sodium/buffer.rb

@@ -1,11 +0,0 @@
-require 'ffi'
-
-module Sodium
-  class Buffer < FFI::MemoryPointer
-    def to_str
-      read_bytes(size)
-    end
-  end
-
-  Buffer.freeze
-end