ffi-libsodium 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94f332ce203bbad97ad3672c32a1f4d5802a18ff
-  data.tar.gz: 35707ee0acbba0620a5807f68cc1718378dfab44
+  metadata.gz: acfdde4dacfa8c79dbb8c79cc752450016d0b38a
+  data.tar.gz: 1ad28c3ae30992f427b1c57ee39d99684457f5d3
 SHA512:
-  metadata.gz: a577783a6c49a53d3cad4d8b4d2db752fca3147ac6a9a9bf86a8737da0a8fa023b1f4a2142fdbcc1aeb5b97ba9b01b14f04d81f8c7485b61403e3f3fb4a608e8
-  data.tar.gz: 439b0519801f2798ee1053bcd4b26717a84bfe67ba64d047fb9a4cdc5af7e7c33260ec07547a685938d9ceb376e178217ce7c6299dea2ba27994d59d9d77ae14
+  metadata.gz: a1ab577ea19b1ae9b5ca0ac4225bbe5cd5192f86d5748f26e501f80d4b082061aa43add2b079956df3ca24e08b5429c58f2259f00c7bdf6206b3e33c9bddf6dd
+  data.tar.gz: e925c7e55392c1c321b31ec27640a05a9361f763b40a0dccd2d8f5847ca5b19d138f01b00a580c0c2ee6e6b2daa6c41ae60093f113b232e1b359e3ea5d86a471

data/lib/crypto/aead/chacha20_poly1305.rb

@@ -53,7 +53,7 @@ module Crypto
         key.noaccess if key.is_a?(Sodium::SecretBuffer)
       end
 
-      def decrypt(ciphertext, additional_data, nonce, key)
+      def decrypt(ciphertext, additional_data, nonce, key, encoding = nil)
         ciphertext_len = get_size(ciphertext)
         if (decrypted_len = ciphertext_len - ABYTES) >= 0
           check_length(nonce, NPUBBYTES, :Nonce)
@@ -62,7 +62,11 @@ module Crypto
           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
+            if encoding
+              decrypted.force_encoding(encoding)
+            else
+              decrypted
+            end
           else
             raise Sodium::CryptoError, "Message forged", caller
           end

data/lib/crypto/box.rb

@@ -96,7 +96,7 @@ module Crypto
       secret_key.noaccess if secret_key.is_a?(Sodium::SecretBuffer)
     end
 
-    def open(ciphertext, nonce, public_key, secret_key)
+    def open(ciphertext, nonce, public_key, secret_key, encoding = nil)
       ciphertext_len = get_size(ciphertext)
       check_length(nonce, NONCEBYTES, :Nonce)
       check_length(public_key, PUBLICKEYBYTES, :PublicKey)
@@ -105,7 +105,11 @@ module Crypto
       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
+        if encoding
+          decrypted.force_encoding(encoding)
+        else
+          decrypted
+        end
       else
         raise Sodium::CryptoError, "Message forged", caller
       end

data/lib/crypto/secret_box.rb

@@ -44,7 +44,7 @@ module Crypto
       key.noaccess if key.is_a?(Sodium::SecretBuffer)
     end
 
-    def open(ciphertext, nonce, key)
+    def open(ciphertext, nonce, key, encoding = nil)
       ciphertext_len = get_size(ciphertext)
       check_length(nonce, NONCEBYTES, :Nonce)
       check_length(key, KEYBYTES, :SecretKey)
@@ -52,7 +52,11 @@ module Crypto
       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
+        if encoding
+          decrypted.force_encoding(encoding)
+        else
+          decrypted
+        end
       else
         raise Sodium::CryptoError, "Message forged", caller
       end

data/lib/sodium/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libsodium
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Hendrik Beskow