ffi-libsodium 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f69721c907579641680a434287394a6bf4167701
-  data.tar.gz: aa8032ace5a3f2cd8ac8a7e664c78da9b87605ab
+  metadata.gz: 6b1a503f0fa3b5aa81160f0901562ad7b3eec093
+  data.tar.gz: a1ed939f6e4109ab1c1ce234cee10a24b9afa44f
 SHA512:
-  metadata.gz: 258b1c21db7bf8e33097284cce68b7ee769336ce68c6522af170dd3026540ccddc3ea9bf62c0d8fab34d34932c76d92cee5454955b77db63c8d69a61667a8bc0
-  data.tar.gz: 3b4c31224024845e5aa13c6e80b4844834b7760015ee328c231d586170f5d2edb9d22756da7bb8f5dfcd5b95cdf764af7794a2d56d4145532b45c9d340bd9026
+  metadata.gz: 30a79852c979c2e52ca8bd9ea0948e20f767e1b5c09e1fab6df64af08ba4dd3a1c7628d14e96f47855fb116ee7282402b48f0349bf34bc552f123b87b955cc8d
+  data.tar.gz: ecbc879ff635b206277f1ac857db6aa47471cd6d6a562e6669504641ca2c42dd059c44efee10c1bee7bae5026142afa9692c603dbed2fe8330c1b8ce7d2eaa23

data/lib/crypto/box.rb

@@ -17,6 +17,7 @@ module Crypto
     attach_function :secretkeybytes,  :crypto_box_secretkeybytes, [], :size_t
     attach_function :noncebytes,      :crypto_box_noncebytes,     [], :size_t
     attach_function :macbytes,        :crypto_box_macbytes,       [], :size_t
+    attach_function :beforenmbytes,   :crypto_box_beforenmbytes,  [], :size_t
 
     PRIMITIVE       = primitive.freeze
     SEEDBYTES       = seedbytes.freeze
@@ -24,6 +25,7 @@ module Crypto
     SECRETKEYBYTES  = secretkeybytes.freeze
     NONCEBYTES      = noncebytes.freeze
     MACBYTES        = macbytes.freeze
+    BEFORENMBYTES   = beforenmbytes.freeze
 
     attach_function :crypto_box_keypair,        [:buffer_out, :buffer_out],             :int
     attach_function :crypto_box_seed_keypair,   [:buffer_out, :buffer_out, :buffer_in], :int
@@ -34,6 +36,8 @@ module Crypto
     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
@@ -84,6 +88,20 @@ module Crypto
       seed.noaccess if seed.is_a?(Sodium::SecretBuffer)
     end
 
+    def beforenm(public_key, secret_key)
+      check_length(public_key, PUBLICKEYBYTES, :PublicKey)
+      check_length(secret_key, SECRETKEYBYTES, :SecretKey)
+
+      shared_secret = Sodium::SecretBuffer.new(BEFORENMBYTES)
+      secret_key.readonly if secret_key.is_a?(Sodium::SecretBuffer)
+      crypto_box_beforenm(shared_secret, public_key, secret_key)
+      shared_secret.noaccess
+
+      shared_secret
+    ensure
+      secret_key.noaccess if secret_key.is_a?(Sodium::SecretBuffer)
+    end
+
     def box(message, nonce, public_key, secret_key)
       message_len = get_size(message)
       check_length(nonce, NONCEBYTES, :Nonce)
@@ -151,8 +169,8 @@ module Crypto
       if crypto_box_open_easy(ciphertext, ciphertext, ciphertext_len, nonce, public_key, secret_key) == -1
         raise Sodium::CryptoError, "Message forged", caller
       end
-
       ciphertext.slice!(message_len..-1)
+
       if encoding
         ciphertext.force_encoding(encoding)
       end

data/lib/crypto/one_time_auth.rb

@@ -34,21 +34,21 @@ module Crypto
     def onetimeauth(message, key)
       check_length(key, KEYBYTES, :SecretKey)
 
-      out = zeros(BYTES)
+      mac = zeros(BYTES)
       key.readonly if key.is_a?(Sodium::SecretBuffer)
-      crypto_onetimeauth(out, message, get_size(message), key)
+      crypto_onetimeauth(mac, message, get_size(message), key)
 
-      out
+      mac
     ensure
       key.noaccess if key.is_a?(Sodium::SecretBuffer)
     end
 
-    def verify(out, message, key)
-      check_length(out, BYTES, :Authenticator)
+    def verify(mac, message, key)
+      check_length(mac, BYTES, :Mac)
       check_length(key, KEYBYTES, :SecretKey)
 
       key.readonly if key.is_a?(Sodium::SecretBuffer)
-      crypto_onetimeauth_verify(out, message, get_size(message), key) == 0
+      crypto_onetimeauth_verify(mac, message, get_size(message), key) == 0
     ensure
       key.noaccess if key.is_a?(Sodium::SecretBuffer)
     end
@@ -70,9 +70,9 @@ module Crypto
     end
 
     def final(state)
-      out = zeros(BYTES)
-      crypto_onetimeauth_final(state, out)
-      out
+      mac = zeros(BYTES)
+      crypto_onetimeauth_final(state, mac)
+      mac
     end
   end
 

data/lib/sodium/version.rb

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

metadata

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