ffi-libsodium 0.4.5 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b1a503f0fa3b5aa81160f0901562ad7b3eec093
-  data.tar.gz: a1ed939f6e4109ab1c1ce234cee10a24b9afa44f
+  metadata.gz: 57615067a7dd57e182c94371c5630f7647ca6912
+  data.tar.gz: 2cf7f5a80af79725867132e1f3592e8141306c2a
 SHA512:
-  metadata.gz: 30a79852c979c2e52ca8bd9ea0948e20f767e1b5c09e1fab6df64af08ba4dd3a1c7628d14e96f47855fb116ee7282402b48f0349bf34bc552f123b87b955cc8d
-  data.tar.gz: ecbc879ff635b206277f1ac857db6aa47471cd6d6a562e6669504641ca2c42dd059c44efee10c1bee7bae5026142afa9692c603dbed2fe8330c1b8ce7d2eaa23
+  metadata.gz: 0bc7c17c8b2b3151b0a195635aa1db849ec80eda0e7d0a253d75ef5d4560fda9f0a0221d3716fe4f3c503d48dbc061f4c9137c0516776a6c2f1bc4411224d433
+  data.tar.gz: a2ef65043e0794f025afc0d01e16f95e6d226f1e5ba2932aee5ab07857dda5105a7f029a7c67bb09b1643a709109bb0a30fa74f9aba9c77e422c51bf35895a3b

data/lib/crypto/aead/chacha20_poly1305.rb

@@ -54,24 +54,24 @@ module Crypto
       end
 
       def decrypt(ciphertext, additional_data, nonce, key, encoding = nil)
-        if (decrypted_len = (ciphertext_len = get_size(ciphertext)) - ABYTES) < 0
+        if (message_len = (ciphertext_len = get_size(ciphertext)) - ABYTES) < 0
           fail Sodium::LengthError, "Ciphertext is too short", caller
         end
 
         check_length(nonce, NPUBBYTES, :Nonce)
         check_length(key, KEYBYTES, :SecretKey)
 
-        decrypted = zeros(decrypted_len)
+        message = zeros(message_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) == -1
+        if crypto_aead_chacha20poly1305_decrypt(message, nil, nil, ciphertext, ciphertext_len, additional_data, get_size(additional_data), nonce, key) == -1
           raise Sodium::CryptoError, "Message forged", caller
         end
 
         if encoding
-          decrypted.force_encoding(encoding)
+          message.force_encoding(encoding)
         end
 
-        decrypted
+        message
       ensure
         key.noaccess if key.is_a?(Sodium::SecretBuffer)
       end

data/lib/crypto/box.rb

@@ -30,14 +30,14 @@ module Crypto
     attach_function :crypto_box_keypair,        [:buffer_out, :buffer_out],             :int
     attach_function :crypto_box_seed_keypair,   [:buffer_out, :buffer_out, :buffer_in], :int
 
+    attach_function :crypto_box_beforenm,       [:buffer_out, :buffer_in, :buffer_in],  :int
+
     attach_function :crypto_box_easy,           [:buffer_out, :buffer_in, :ulong_long, :buffer_in, :buffer_in, :buffer_in], :int
     attach_function :crypto_box_open_easy,      [:buffer_out, :buffer_in, :ulong_long, :buffer_in, :buffer_in, :buffer_in], :int
 
     attach_function :crypto_box_detached,       [:buffer_out, :buffer_out, :buffer_in, :ulong_long, :buffer_in, :buffer_in, :buffer_in],  :int
     attach_function :crypto_box_open_detached,  [:buffer_out, :buffer_in, :buffer_in, :ulong_long, :buffer_in, :buffer_in, :buffer_in],   :int
 
-    attach_function :crypto_box_beforenm,       [:buffer_out, :buffer_in, :buffer_in],  :int
-
     module_function
 
     def nonce
@@ -123,17 +123,17 @@ module Crypto
       check_length(public_key, PUBLICKEYBYTES, :PublicKey)
       check_length(secret_key, SECRETKEYBYTES, :SecretKey)
 
-      decrypted = zeros(ciphertext_len - MACBYTES)
+      message = 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) == -1
+      if crypto_box_open_easy(message, ciphertext, ciphertext_len, nonce, public_key, secret_key) == -1
         raise Sodium::CryptoError, "Message forged", caller
       end
 
       if encoding
-        decrypted.force_encoding(encoding)
+        message.force_encoding(encoding)
       end
 
-      decrypted
+      message
     ensure
       secret_key.noaccess if secret_key.is_a?(Sodium::SecretBuffer)
     end
@@ -202,17 +202,17 @@ module Crypto
       check_length(public_key, PUBLICKEYBYTES, :PublicKey)
       check_length(secret_key, SECRETKEYBYTES, :SecretKey)
 
-      decrypted = zeros(ciphertext_len)
+      message = zeros(ciphertext_len)
       secret_key.readonly if secret_key.is_a?(Sodium::SecretBuffer)
-      if crypto_box_open_detached(decrypted, ciphertext, mac, ciphertext_len, nonce, public_key, secret_key) == -1
+      if crypto_box_open_detached(message, ciphertext, mac, ciphertext_len, nonce, public_key, secret_key) == -1
         raise Sodium::CryptoError, "Message forged", caller
       end
 
       if encoding
-        decrypted.force_encoding(encoding)
+        message.force_encoding(encoding)
       end
 
-      decrypted
+      message
     ensure
       secret_key.noaccess if secret_key.is_a?(Sodium::SecretBuffer)
     end

data/lib/crypto/secret_box.rb

@@ -115,7 +115,7 @@ module Crypto
       ciphertext = zeros(message_len)
       mac = zeros(MACBYTES)
       key.readonly if key.is_a?(Sodium::SecretBuffer)
-      crypto_secretbox_easy(ciphertext, mac, message, message_len, nonce, key)
+      crypto_secretbox_detached(ciphertext, mac, message, message_len, nonce, key)
 
       [ciphertext, mac]
     ensure
@@ -128,17 +128,17 @@ module Crypto
       check_length(nonce, NONCEBYTES, :Nonce)
       check_length(key, KEYBYTES, :SecretKey)
 
-      decrypted = zeros(ciphertext_len)
+      message = zeros(ciphertext_len)
       key.readonly if key.is_a?(Sodium::SecretBuffer)
-      if crypto_secretbox_open_easy(decrypted, ciphertext, mac, ciphertext_len, nonce, key) == -1
+      if crypto_secretbox_open_detached(message, ciphertext, mac, ciphertext_len, nonce, key) == -1
         raise Sodium::CryptoError, "Message forged", caller
       end
 
       if encoding
-        decrypted.force_encoding(encoding)
+        message.force_encoding(encoding)
       end
 
-      decrypted
+      message
     ensure
       key.noaccess if key.is_a?(Sodium::SecretBuffer)
     end
@@ -149,7 +149,7 @@ module Crypto
 
       mac = zeros(MACBYTES)
       key.readonly if key.is_a?(Sodium::SecretBuffer)
-      crypto_secretbox_easy(message, message, mac, get_size(message), nonce, key)
+      crypto_secretbox_detached(message, mac, message, get_size(message), nonce, key)
 
       [message, mac]
     ensure
@@ -162,7 +162,7 @@ module Crypto
       check_length(key, KEYBYTES, :SecretKey)
 
       key.readonly if key.is_a?(Sodium::SecretBuffer)
-      if crypto_secretbox_open_easy(ciphertext, ciphertext, mac, get_size(ciphertext), nonce, key) == -1
+      if crypto_secretbox_open_detached(ciphertext, ciphertext, mac, get_size(ciphertext), nonce, key) == -1
         raise Sodium::CryptoError, "Message forged", caller
       end
 

data/lib/crypto/sign.rb

@@ -90,7 +90,7 @@ module Crypto
       secret_key.noaccess if secret_key.is_a?(Sodium::SecretBuffer)
     end
 
-    def open(sealed_message, public_key)
+    def open(sealed_message, public_key, encoding = nil)
       sealed_message_len = get_size(sealed_message)
       check_length(public_key, PUBLICKEYBYTES, :PublicKey)
 
@@ -100,6 +100,10 @@ module Crypto
         raise Sodium::CryptoError, "Incorrect signature", caller
       end
 
+      if encoding
+        unsealed_message.force_encoding(encoding)
+      end
+
       unsealed_message
     end
 

data/lib/sodium/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libsodium
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.7
 platform: ruby
 authors:
 - Hendrik Beskow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi