ffi-libsodium 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3e68050c2be22e883d5a4b8d33e506716eb4832
-  data.tar.gz: 1b0db0b2e8deba32fe9d50b2541ec33dc4555d47
+  metadata.gz: 193aa2e92e5fc462d8d7f3c68a2ab71c9fb855a0
+  data.tar.gz: abc95a71587cea89a4d119ed6a1625b4337532cd
 SHA512:
-  metadata.gz: 665970302f6c60c038d6c101976ac89609fb18c34c2c8527f18a7450f36c6368b31568aa526add077c02fb489025c8c0a665288e784593a6099ada95eb8f4a37
-  data.tar.gz: 3f952d79deca01a35f021c311d9c148192c058d486e5cd2dc7c4aa98e174831d1130028cec4610beebf33a2db2e17450864d95f5a0010849bd9aa5b9ad73d494
+  metadata.gz: 19ab15b9ced7dbbc0da8b58bfbe2717c55dad11731ecd09c0c7c774a42a3b58260467ee6116fd17a65b01d8d020679fba5bb9a770d1c972007d2b20a20d2bbb7
+  data.tar.gz: e757e619ae02c46e91c336aebc1b632c0a652eec8e71453bf9efc3870e2be4448fd0fc22bef42e456889865fdb7c63a04242a99ad7cf138db6c278245491f5c0

data/lib/crypto/aead/chacha20_poly1305.rb

@@ -29,8 +29,8 @@ module Crypto
       NPUBBYTES = npubbytes.freeze
       ABYTES    = abytes.freeze
 
-      attach_function :crypto_aead_chacha20poly1305_encrypt,  [:buffer_out, :buffer_out, :buffer_in, :ulong_long, :buffer_in, :ulong_long, :pointer, :buffer_in, :buffer_in], :int, blocking: true
-      attach_function :crypto_aead_chacha20poly1305_decrypt,  [:buffer_out, :buffer_out, :pointer, :buffer_in, :ulong_long, :buffer_in, :ulong_long, :buffer_in, :buffer_in], :int, blocking: true
+      attach_function :crypto_aead_chacha20poly1305_encrypt,  [:buffer_out, :pointer, :buffer_in, :ulong_long, :buffer_in, :ulong_long, :pointer, :buffer_in, :buffer_in], :int, blocking: true
+      attach_function :crypto_aead_chacha20poly1305_decrypt,  [:buffer_out, :pointer, :pointer, :buffer_in, :ulong_long, :buffer_in, :ulong_long, :buffer_in, :buffer_in], :int, blocking: true
 
       module_function
 
@@ -45,30 +45,30 @@ module Crypto
         check_length(key, KEYBYTES, :SecretKey)
 
         ciphertext = FFI::MemoryPointer.new(:uchar, message_len + ABYTES)
-        ciphertext_len = FFI::MemoryPointer.new(:ulong_long)
         key.readonly if key.is_a?(Sodium::SecretBuffer)
-        crypto_aead_chacha20poly1305_encrypt(ciphertext, ciphertext_len, message, message_len, additional_data, additional_data_len, nil, nonce, key)
+        crypto_aead_chacha20poly1305_encrypt(ciphertext, nil, message, message_len, additional_data, additional_data_len, nil, nonce, key)
         key.noaccess if key.is_a?(Sodium::SecretBuffer)
 
-        [ciphertext, ciphertext_len.read_ulong_long]
+        ciphertext
       end
 
-      def decrypt(ciphertext, clen, additional_data, nonce, key)
-        ciphertext_len = get_int(clen)
+      def decrypt(ciphertext, additional_data, nonce, key)
+        unless ((ciphertext_len = get_size(ciphertext)) - ABYTES) > 0
+          fail Sodium::LengthError, "Ciphertext is too short", caller
+        end
         additional_data_len = get_size(additional_data)
         check_length(nonce, NPUBBYTES, :Nonce)
         check_length(key, KEYBYTES, :SecretKey)
 
-        decrypted = FFI::MemoryPointer.new(:uchar, ciphertext_len)
-        decrypted_len = FFI::MemoryPointer.new(:ulong_long)
+        decrypted = FFI::MemoryPointer.new(:uchar, ciphertext_len - ABYTES)
         key.readonly if key.is_a?(Sodium::SecretBuffer)
-        rc = crypto_aead_chacha20poly1305_decrypt(decrypted, decrypted_len, nil, ciphertext, ciphertext_len, additional_data, additional_data_len, nonce, key)
+        rc = crypto_aead_chacha20poly1305_decrypt(decrypted, nil, nil, ciphertext, ciphertext_len, additional_data, additional_data_len, nonce, key)
         key.noaccess if key.is_a?(Sodium::SecretBuffer)
         if rc == -1
           raise Sodium::CryptoError, "Message forged", caller
         end
 
-        [decrypted, decrypted_len.read_ulong_long]
+        decrypted
       end
     end
   end

data/lib/crypto/auth.rb

@@ -48,7 +48,9 @@ module Crypto
     end
   end
 
-  def self.auth(*args)
+  module_function
+
+  def auth(*args)
     Auth.auth(*args)
   end
 end

data/lib/crypto/box.rb

@@ -55,8 +55,10 @@ module Crypto
 
       public_key = Sodium::Buffer.new(:uchar, PUBLICKEYBYTES)
       secret_key = Sodium::Buffer.new(:uchar, SECRETKEYBYTES)
+      seed.readonly if seed.is_a?(Sodium::SecretBuffer)
       crypto_box_seed_keypair(public_key, secret_key, seed)
-
+      seed.noaccess if seed.is_a?(Sodium::SecretBuffer)
+      
       [public_key, secret_key]
     end
 
@@ -73,8 +75,10 @@ module Crypto
       check_length(seed, SEEDBYTES, :Seed)
 
       public_key = Sodium::Buffer.new(:uchar, PUBLICKEYBYTES)
-      secret_key = Sodium::SecretBuffer.new(:uchar, SECRETKEYBYTES)
+      secret_key = Sodium::SecretBuffer.new(SECRETKEYBYTES)
+      seed.readonly if seed.is_a?(Sodium::SecretBuffer)
       crypto_box_seed_keypair(public_key, secret_key, seed)
+      seed.noaccess if seed.is_a?(Sodium::SecretBuffer)
       secret_key.noaccess
 
       [public_key, secret_key]
@@ -86,7 +90,7 @@ module Crypto
       check_length(public_key, PUBLICKEYBYTES, :PublicKey)
       check_length(secret_key, SECRETKEYBYTES, :SecretKey)
 
-      ciphertext = Sodium::Buffer.new(:uchar, MACBYTES + message_len)
+      ciphertext = Sodium::Buffer.new(:uchar, 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)
       secret_key.noaccess if secret_key.is_a?(Sodium::SecretBuffer)

data/lib/crypto/pw_hash/scrypt_salsa208_sha256.rb

@@ -49,7 +49,7 @@ module Crypto
         RandomBytes.buf(SALTBYTES)
       end
 
-      def scryptsalsa208sha256(passwd, outlen, salt, opslimit = OPSLIMIT_INTERACTIVE, memlimit = MEMLIMIT_INTERACTIVE)
+      def scryptsalsa208sha256(outlen, passwd, salt, opslimit = OPSLIMIT_INTERACTIVE, memlimit = MEMLIMIT_INTERACTIVE)
         passwd_len = get_size(passwd)
         check_length(salt, SALTBYTES, :Salt)
         if opslimit < OPSLIMIT_INTERACTIVE

data/lib/crypto/scalar_mult.rb

@@ -37,7 +37,7 @@ module Crypto
 
     def scalarmut(secret_key, public_key)
       check_length(secret_key, SCALARBYTES, :SecretKey)
-      check_length(public_key, SCALARBYTES, :PublicKey)
+      check_length(public_key, BYTES, :PublicKey)
 
       shared_secret = Sodium::SecretBuffer.new(BYTES)
       secret_key.readonly if secret_key.is_a?(Sodium::SecretBuffer)

data/lib/crypto/secret_box.rb

@@ -35,7 +35,7 @@ module Crypto
       check_length(nonce, NONCEBYTES, :Nonce)
       check_length(key, KEYBYTES, :SecretKey)
 
-      ciphertext = Sodium::Buffer.new(:uchar, MACBYTES + message_len)
+      ciphertext = Sodium::Buffer.new(:uchar, message_len + MACBYTES)
       key.readonly if key.is_a?(Sodium::SecretBuffer)
       crypto_secretbox_easy(ciphertext, message, message_len, nonce, key)
       key.noaccess if key.is_a?(Sodium::SecretBuffer)

data/lib/crypto/sign.rb

@@ -75,24 +75,25 @@ module Crypto
       message_len = get_size(message)
       check_length(secret_key, SECRETKEYBYTES, :SecretKey)
 
-      sealed_message = FFI::MemoryPointer.new(:uchar, BYTES + message_len)
-      sealed_message_len = FFI::MemoryPointer.new(:ulong_long)
+      sealed_message = Sodium::Buffer.new(:uchar, message_len + BYTES)
       secret_key.readonly if secret_key.is_a?(Sodium::SecretBuffer)
-      crypto_sign(sealed_message, sealed_message_len, message, message_len, secret_key)
+      crypto_sign(sealed_message, nil, message, message_len, secret_key)
       secret_key.noaccess if secret_key.is_a?(Sodium::SecretBuffer)
 
-      [sealed_message, sealed_message_len.read_ulong_long]
+      sealed_message
     end
 
-    def open(sealed_message, smlen, public_key)
-      sealed_message_len = get_int(smlen)
+    def open(sealed_message, public_key)
+      sealed_message_len = get_size(sealed_message)
       check_length(public_key, PUBLICKEYBYTES, :PublicKey)
 
-      unsealed_message = FFI::MemoryPointer.new(:uchar, sealed_message_len)
+      unsealed_message = Sodium::Buffer.new(:uchar, sealed_message_len - BYTES)
       unsealed_message_len = FFI::MemoryPointer.new(:ulong_long)
-      crypto_sign_open(unsealed_message, unsealed_message_len, sealed_message, sealed_message_len, public_key)
+      if crypto_sign_open(unsealed_message, unsealed_message_len, sealed_message, sealed_message_len, public_key) == -1
+        raise Sodium::CryptoError, "Incorrect signature", caller
+      end
 
-      [unsealed_message, unsealed_message_len.read_ulong_long]
+      unsealed_message
     end
   end
 

data/lib/sodium/utils.rb

@@ -57,6 +57,8 @@ module Sodium
         data.bytesize
       elsif data.is_a?(FFI::Pointer) ||data.respond_to?(:size)
         data.size
+      elsif data.nil?
+        0
       else
         fail ArgumentError, "#{data.class} doesn't respond to :bytesize or :size", caller
       end

data/lib/sodium/version.rb

@@ -1,3 +1,3 @@
 module Sodium
-  VERSION = '0.0.5'.freeze
+  VERSION = '0.0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libsodium
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Hendrik Beskow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi