ffi-libsodium 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 613f14c043ff696627ef5d0009113367982a57a7
-  data.tar.gz: cc4459674fa3bc66f33e1868726ab63699b9f30e
+  metadata.gz: ada72fa7e9887b70143e4e2bba21d0b2165d72a9
+  data.tar.gz: 5bfac66a243ac4861d782e5c8ba7fcb412f6264f
 SHA512:
-  metadata.gz: 0aec4788173e268528120fac6a2504a3fdf2a0a2c721f4b809edb9aaef4da6e59191e851ad829e86573010845a7a45764f0a1fb3884b3945374f1f1e302ee0ac
-  data.tar.gz: 00ac3a7187a277456a03f2db49f4896ebd952a2d29c9d5014a4a17cad51c222cccb12a78543fc822acd43ca36c8423919e58b8a1c1860a797b8d493c87f3c4d2
+  metadata.gz: 7bd7feeb776a528d318bea1ffca5108ee3ea5751acfb3d98e96d0c152c516bc1e601e3c20421ad5d1bc73276fdb616e62102f6fd552d57c881af7ef2f7269c4a
+  data.tar.gz: 1e3381716d27b253ba9623b48310bfc5954b23e59904b5e93a27d423764c6f6c73bd3616d10801322eff4db8e9e698528e7ef3c5ccb43d237f5a4b9fa589e39e

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
-      attach_function :crypto_aead_chacha20poly1305_decrypt,  [:buffer_out, :buffer_out, :pointer, :buffer_in, :ulong_long, :buffer_in, :ulong_long, :buffer_in, :buffer_in], :int
+      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
 
       module_function
 

data/lib/crypto/box.rb

@@ -15,6 +15,7 @@ module Crypto
     attach_function :seedbytes,       :crypto_box_seedbytes,      [], :size_t
     attach_function :publickeybytes,  :crypto_box_publickeybytes, [], :size_t
     attach_function :secretkeybytes,  :crypto_box_secretkeybytes, [], :size_t
+    attach_function :beforenmbytes,   :crypto_box_beforenmbytes,  [], :size_t
     attach_function :noncebytes,      :crypto_box_noncebytes,     [], :size_t
     attach_function :macbytes,        :crypto_box_macbytes,       [], :size_t
 
@@ -22,6 +23,7 @@ module Crypto
     SEEDBYTES       = seedbytes.freeze
     PUBLICKEYBYTES  = publickeybytes.freeze
     SECRETKEYBYTES  = secretkeybytes.freeze
+    BEFORENMBYTES   = beforenmbytes.freeze
     NONCEBYTES      = noncebytes.freeze
     MACBYTES        = macbytes.freeze
 
@@ -31,6 +33,11 @@ module Crypto
     attach_function :crypto_box_easy,       [:buffer_out, :buffer_in, :ulong_long, :buffer_in, :buffer_in, :buffer_in], :int, blocking: true
     attach_function :crypto_box_open_easy,  [:buffer_out, :buffer_in, :ulong_long, :buffer_in, :buffer_in, :buffer_in], :int, blocking: true
 
+    attach_function :crypto_box_beforenm,     [:buffer_out, :buffer_in, :buffer_in],  :int, blocking: true
+
+    attach_function :crypto_box_afternm,      [:buffer_out, :buffer_in, :ulong_long, :buffer_in, :buffer_in], :int, blocking: true
+    attach_function :crypto_box_open_afternm, [:buffer_out, :buffer_in, :ulong_long, :buffer_in, :buffer_in], :int, blocking: true
+
     module_function
 
     def nonce
@@ -89,6 +96,8 @@ module Crypto
       ciphertext
     end
 
+    alias_method :box, :easy
+
     def open_easy(ciphertext, nonce, public_key, secret_key)
       ciphertext_len = get_size(ciphertext)
       check_length(nonce, NONCEBYTES, :Nonce)
@@ -106,6 +115,8 @@ module Crypto
       decrypted
     end
 
+    alias_method :open, :open_easy
+
     def easy_in_place(data, nonce, public_key, secret_key)
       message = get_string(data)
       check_length(nonce, NONCEBYTES, :Nonce)
@@ -146,5 +157,43 @@ module Crypto
 
       ciphertext
     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)
+      crypto_box_beforenm(shared_secret, public_key, secret_key)
+
+      shared_secret
+    end
+
+    def afternm(message, nonce, shared_secret)
+      message_len = get_size(message)
+      check_length(nonce, NONCEBYTES, :Nonce)
+      check_length(shared_secret, BEFORENMBYTES, :SharedSecret)
+
+      ciphertext = Sodium::Buffer.new(:uchar, MACBYTES + message_len)
+      crypto_box_afternm(ciphertext, message, message_len, nonce, shared_secret)
+
+      ciphertext
+    end
+
+    def open_afternm(ciphertext, nonce, shared_secret)
+      ciphertext_len = get_size(ciphertext)
+      check_length(nonce, NONCEBYTES, :Nonce)
+      check_length(shared_secret, BEFORENMBYTES, :SharedSecret)
+
+      decrypted = Sodium::Buffer.new(:uchar, ciphertext_len - MACBYTES)
+      if crypto_box_open_afternm(decrypted, ciphertext, ciphertext_len, nonce, shared_secret) == -1
+        raise Sodium::CryptoError, "Message forged", caller
+      end
+
+      decrypted
+    end
+  end
+
+  def box(*args)
+    Box.box(*args)
   end
 end

data/lib/crypto/one_time_auth.rb

@@ -18,17 +18,17 @@ module Crypto
     BYTES     = bytes.freeze
     KEYBYTES  = keybytes.freeze
 
-    attach_function :crypto_onetimeauth,        [:buffer_out, :buffer_in, :ulong_long, :buffer_in], :int
-    attach_function :crypto_onetimeauth_verify, [:buffer_in, :buffer_in, :ulong_long, :buffer_in],  :int
+    attach_function :crypto_onetimeauth,        [:buffer_out, :buffer_in, :ulong_long, :buffer_in], :int, blocking: true
+    attach_function :crypto_onetimeauth_verify, [:buffer_in, :buffer_in, :ulong_long, :buffer_in],  :int, blocking: true
 
     class State < FFI::Struct
       layout  :aligner, :ulong_long,
               :opaque,  [:uchar, 136]
     end
 
-    attach_function :crypto_onetimeauth_init,   [State.ptr, :buffer_in],              :int
-    attach_function :crypto_onetimeauth_update, [State.ptr, :buffer_in, :ulong_long], :int
-    attach_function :crypto_onetimeauth_final,  [State.ptr, :buffer_out],             :int
+    attach_function :crypto_onetimeauth_init,   [State.ptr, :buffer_in],              :int, blocking: true
+    attach_function :crypto_onetimeauth_update, [State.ptr, :buffer_in, :ulong_long], :int, blocking: true
+    attach_function :crypto_onetimeauth_final,  [State.ptr, :buffer_out],             :int, blocking: true
 
     module_function
 

data/lib/crypto/scalar_mult.rb

@@ -19,8 +19,8 @@ module Crypto
     BYTES       = bytes.freeze
     SCALARBYTES = scalarbytes.freeze
 
-    attach_function :crypto_scalarmult_base,  [:buffer_out, :buffer_in],              :int
-    attach_function :crypto_scalarmult,       [:buffer_out, :buffer_in, :buffer_in],  :int
+    attach_function :crypto_scalarmult_base,  [:buffer_out, :buffer_in],              :int, blocking: true
+    attach_function :crypto_scalarmult,       [:buffer_out, :buffer_in, :buffer_in],  :int, blocking: true
 
     module_function
 

data/lib/crypto/short_hash.rb

@@ -18,7 +18,7 @@ module Crypto
     BYTES     = bytes.freeze
     KEYBYTES  = keybytes.freeze
 
-    attach_function :crypto_shorthash,  [:buffer_out, :buffer_in, :ulong_long, :buffer_in], :int
+    attach_function :crypto_shorthash,  [:buffer_out, :buffer_in, :ulong_long, :buffer_in], :int, blocking: true
 
     module_function
 

data/lib/crypto/sign.rb

@@ -23,11 +23,11 @@ module Crypto
     PUBLICKEYBYTES  = publickeybytes.freeze
     SECRETKEYBYTES  = secretkeybytes.freeze
 
-    attach_function :crypto_sign_keypair,       [:buffer_out, :buffer_out],             :int
-    attach_function :crypto_sign_seed_keypair,  [:buffer_out, :buffer_out, :buffer_in], :int
+    attach_function :crypto_sign_keypair,       [:buffer_out, :buffer_out],             :int, blocking: true
+    attach_function :crypto_sign_seed_keypair,  [:buffer_out, :buffer_out, :buffer_in], :int, blocking: true
 
-    attach_function :crypto_sign,       [:buffer_out, :buffer_out, :buffer_in, :ulong_long, :buffer_in],  :int
-    attach_function :crypto_sign_open,  [:buffer_out, :buffer_out, :buffer_in, :ulong_long, :buffer_in],  :int
+    attach_function :crypto_sign,       [:buffer_out, :buffer_out, :buffer_in, :ulong_long, :buffer_in],  :int, blocking: true
+    attach_function :crypto_sign_open,  [:buffer_out, :buffer_out, :buffer_in, :ulong_long, :buffer_in],  :int, blocking: true
 
     module_function
 

data/lib/sodium/version.rb

@@ -1,3 +1,3 @@
 module Sodium
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

metadata

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