ffi-libsodium 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 809b5a363af975be25d1bece0bf14d70fffacd36
-  data.tar.gz: 52789ce07fa6173a7eb8f7602ededd02dc74f720
+  metadata.gz: 58327f2bb9c42be2df97ac8335ea4ed62d0cdc09
+  data.tar.gz: aaa7cfd98b775901e0c1e8cb767df222b3727d13
 SHA512:
-  metadata.gz: 33ac72f615ac5b7eda4407b28588321aa74d2274a1dcac5455986cb68511c8d786451ad01fdbe5160a8ad06a8762d95043646ec87b45a4b809f16efc0e11c6a4
-  data.tar.gz: bdd464b328937b41f9f2f5f9300fd734758462f96310ae4fa84c906343a277e54ecc76c0835519d8cedecc08184c490182434d93abf4660c9bb1cf746582b3fa
+  metadata.gz: 21c89d5597a816816f311aa56bbd47312f10c086c9376b287049a596117a9020cde9401ab3741c10fa6b8747c7cf2825b5e2f2a5c98e7746fa0b1abf914b902d
+  data.tar.gz: 00fde23905b545079a29cd981d7e6267a0e02cfa1650155cc4b87bc2b66fd143229c855f893852236d5775a990f16fbbf36fc9cdc8a632f6852339a5e04cf5d4

data/lib/crypto/aead/chacha20_poly1305.rb

@@ -1,7 +1,9 @@
-require_relative '../../sodium'
+require 'ffi'
 require_relative '../../sodium/utils'
-require_relative '../../sodium/secret_buffer'
 require_relative '../../random_bytes'
+require_relative '../../sodium/buffer'
+require_relative '../../sodium/secret_buffer'
+require_relative '../../sodium'
 
 module Crypto
   module AEAD

data/lib/crypto/auth.rb

@@ -1,4 +1,4 @@
-require_relative '../sodium'
+require 'ffi'
 require_relative '../sodium/utils'
 require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'

data/lib/crypto/box.rb

@@ -1,8 +1,9 @@
-require_relative '../sodium'
+require 'ffi'
 require_relative '../sodium/utils'
+require_relative '../random_bytes'
 require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'
-require_relative '../random_bytes'
+require_relative '../sodium'
 
 module Crypto
   module Box
@@ -58,7 +59,7 @@ module Crypto
       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
 

data/lib/crypto/generic_hash.rb

@@ -1,5 +1,6 @@
-require_relative '../sodium'
+require 'ffi'
 require_relative '../sodium/utils'
+require_relative '../sodium'
 require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'
 

data/lib/crypto/one_time_auth.rb

@@ -1,4 +1,4 @@
-require_relative '../sodium'
+require 'ffi'
 require_relative '../sodium/utils'
 require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'

data/lib/crypto/pw_hash/scrypt_salsa208_sha256.rb

@@ -1,8 +1,8 @@
-require_relative '../../sodium'
+require 'ffi'
 require_relative '../../sodium/utils'
-require_relative '../../sodium/buffer'
-require_relative '../../sodium/secret_buffer'
 require_relative '../../random_bytes'
+require_relative '../../sodium'
+require_relative '../../sodium/secret_buffer'
 
 module Crypto
   module PwHash

data/lib/crypto/scalar_mult.rb

@@ -1,8 +1,7 @@
-require_relative '../sodium'
+require 'ffi'
 require_relative '../sodium/utils'
 require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'
-require_relative '../random_bytes'
 
 module Crypto
   module ScalarMult

data/lib/crypto/secret_box.rb

@@ -1,8 +1,9 @@
-require_relative '../sodium'
+require 'ffi'
 require_relative '../sodium/utils'
+require_relative '../random_bytes'
 require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'
-require_relative '../random_bytes'
+require_relative '../sodium'
 
 module Crypto
   module SecretBox

data/lib/crypto/short_hash.rb

@@ -1,4 +1,4 @@
-require_relative '../sodium'
+require 'ffi'
 require_relative '../sodium/utils'
 require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'

data/lib/crypto/sign.rb

@@ -1,8 +1,8 @@
-require_relative '../sodium'
+require 'ffi'
 require_relative '../sodium/utils'
 require_relative '../sodium/buffer'
 require_relative '../sodium/secret_buffer'
-require_relative '../random_bytes'
+require_relative '../sodium'
 
 module Crypto
   module Sign

data/lib/crypto/sign/ed25519.rb

@@ -0,0 +1,57 @@
+require 'ffi'
+require_relative '../../sodium/utils'
+require_relative '../scalar_mult'
+require_relative '../../sodium/buffer'
+require_relative '../../sodium/secret_buffer'
+
+module Crypto
+  module Sign
+    module Ed25519
+      PRIMITIVE = 'ed25519'.freeze
+      extend FFI::Library
+      extend Sodium::Utils
+
+      ffi_lib :libsodium
+
+      class << self
+        def crypto_sign_ed25519_primitive
+          PRIMITIVE
+        end
+
+        alias_method :primitive, :crypto_sign_ed25519_primitive
+      end
+
+      attach_function :publickeybytes,  :crypto_sign_ed25519_publickeybytes,  [], :size_t
+      attach_function :secretkeybytes,  :crypto_sign_ed25519_secretkeybytes,  [], :size_t
+
+      PUBLICKEYBYTES  = publickeybytes.freeze
+      SECRETKEYBYTES  = secretkeybytes.freeze
+
+      attach_function :crypto_sign_ed25519_pk_to_curve25519,  [:buffer_out, :buffer_in],  :int
+      attach_function :crypto_sign_ed25519_sk_to_curve25519,  [:buffer_out, :buffer_in],  :int
+
+      module_function
+
+      def pk_to_curve25519(public_key)
+        check_length(public_key, PUBLICKEYBYTES, :PublicKey)
+
+        curve25519_pk = Sodium::Buffer.new(:uchar, ScalarMult::BYTES)
+        crypto_sign_ed25519_pk_to_curve25519(curve25519_pk, public_key)
+
+        curve25519_pk
+      end
+
+      def sk_to_curve25519(secret_key)
+        check_length(secret_key, SECRETKEYBYTES, :SecretKey)
+
+        curve25519_sk = Sodium::SecretBuffer.new(ScalarMult::BYTES)
+        secret_key.readonly if secret_key.is_a?(Sodium::SecretBuffer)
+        crypto_sign_ed25519_sk_to_curve25519(curve25519_sk, secret_key)
+        secret_key.noaccess if secret_key.is_a?(Sodium::SecretBuffer)
+        curve25519_sk.noaccess
+
+        curve25519_sk
+      end
+    end
+  end
+end

data/lib/libsodium.rb

@@ -13,6 +13,7 @@ require_relative 'crypto/short_hash'
 require_relative 'crypto/pw_hash/scrypt_salsa208_sha256'
 require_relative 'crypto/one_time_auth'
 require_relative 'crypto/scalar_mult'
+require_relative 'crypto/sign/ed25519'
 
 Thread.exclusive do
   if Sodium.init == -1

data/lib/random_bytes.rb

@@ -1,4 +1,5 @@
-require_relative 'sodium/buffer'
+require 'ffi'
+require_relative 'sodium/buffer'
 
 module RandomBytes
   extend FFI::Library

data/lib/sodium/secret_buffer.rb

@@ -1,4 +1,7 @@
-require_relative '../sodium'
+require 'forwardable'
+require_relative 'utils'
+require_relative '../sodium'
+require 'ffi'
 
 module Sodium
   class SecretBuffer

data/lib/sodium/utils.rb

@@ -1,4 +1,5 @@
 require_relative '../sodium'
+require 'ffi'
 
 module Sodium
   module Utils
@@ -69,5 +70,15 @@ module Sodium
     def zeros(n)
       ZERO * n
     end
+
+    HEXY = 'H*'.freeze
+
+    def bin2hex(bytes)
+      bytes.to_str.unpack(HEXY).first
+    end
+
+    def hex2bin(hex)
+      [hex].pack(HEXY)
+    end
   end
 end

data/lib/sodium/version.rb

@@ -1,3 +1,3 @@
 module Sodium
-  VERSION = '0.0.7'.freeze
+  VERSION = '0.0.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libsodium
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Hendrik Beskow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -56,6 +56,7 @@ files:
 - lib/crypto/secret_box.rb
 - lib/crypto/short_hash.rb
 - lib/crypto/sign.rb
+- lib/crypto/sign/ed25519.rb
 - lib/libsodium.rb
 - lib/random_bytes.rb
 - lib/sodium.rb