rbnacl 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee6ee0f334ee9f46c4ec0bc6fd5c82666780740c
-  data.tar.gz: 26c902ffe1a46d82e0ee822dff3b03ef7a00aae7
+  metadata.gz: bcf4ccd28c18cf4c35fbdaf0b6a477e76611dde0
+  data.tar.gz: 9e6e95385b32259c3de1a5be583e20f910ba3f9d
 SHA512:
-  metadata.gz: 59b17731059eb1eed48984fb657af152eead63527e91840c17cee5114cd9ac579edd0427a1a2dcc3b846714beeecd66739926c9089663d75901d59468e969eef
-  data.tar.gz: 04ce82d844ae5fdf10c634275db80e56aba13391f9f1364d306b1119ba646b4eff875377b6c94ed05dc9682f935ee8a9db3fc0e5177b8bcb7923ed4fe88eb293
+  metadata.gz: 06843ef90fb734f7b2003adf225f78701682766c45fc5f786e4ee2e09347f7b3827df96fa14e39a3347eb097db168327f58e8867f483cbfd07fcc6dbb0870849
+  data.tar.gz: 5afb3ed48547db7e6883478654fe4c06065aa2fec84e43ce78d6f950d3cc439130039aad2eb34240bfe1026ed4939efa10878dc31ec5a0faadc67af6f6adfa5c

data/.rubocop.yml

@@ -9,7 +9,7 @@ LineLength:
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
-Style/SingleSpaceBeforeFirstArg:
+Style/SpaceBeforeFirstArg:
   Enabled: false
 
 Style/GlobalVars:
@@ -20,8 +20,13 @@ Style/GlobalVars:
 #
 
 Metrics/MethodLength:
-  CountComments: false
-  Max: 25
+  Max: 22
 
 Metrics/AbcSize:
   Max: 20
+
+AllCops:
+  Include:
+    - '**/Rakefile'
+  Exclude:
+    - 'spec/**/*'

data/.travis.yml

@@ -1,13 +1,20 @@
+language: ruby
+sudo: false
 script: bundle exec rake ci
+branches:
+  only:
+    - master
+
+bundler_args: --without development
 
 rvm:
   - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
   - ruby-head
   - jruby
-  - jruby-9.0.4.0
+  - jruby-9.0.5.0
   - jruby-head
   - rbx-2
 

data/CHANGES.md

@@ -1,3 +1,13 @@
+3.4.0 (2015-05-07)
+------------------
+* [#135](https://github.com/cryptosphere/rbnacl/pull/135)
+  Expose RbNaCl::Signatures::Ed25519#keypair_bytes.
+  (@grempe)
+
+* [#137](https://github.com/cryptosphere/rbnacl/pull/137)
+  Expose HMAC-SHA512 (with 64-byte keys)
+  (@mwpastore)
+
 3.3.0 (2015-12-29)
 ------------------
 * [#105](https://github.com/cryptosphere/rbnacl/pull/105)

data/Gemfile

@@ -1,6 +1,5 @@
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in rbnacl.gemspec
 gemspec
 
 group :development do
@@ -8,6 +7,12 @@ group :development do
 end
 
 group :test do
+  gem "rspec"
+  gem "rubocop", "0.39.0"
   gem "coveralls", require: false
   gem "rbnacl-libsodium", ENV["LIBSODIUM_VERSION"]
 end
+
+group :development, :test do
+  gem "rake"
+end

data/README.md

@@ -4,6 +4,7 @@
 [![Build Status](https://travis-ci.org/cryptosphere/rbnacl.svg?branch=master)](https://travis-ci.org/cryptosphere/rbnacl)
 [![Code Climate](https://codeclimate.com/github/cryptosphere/rbnacl.svg)](https://codeclimate.com/github/cryptosphere/rbnacl)
 [![Coverage Status](https://coveralls.io/repos/cryptosphere/rbnacl/badge.svg?branch=master)](https://coveralls.io/r/cryptosphere/rbnacl)
+[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/cryptosphere/rbnacl/blob/master/LICENSE.txt)
 
 A Ruby binding to the state-of-the-art [Networking and Cryptography][nacl]
 library by [Daniel J. Bernstein][djb]. This is **NOT** Google Native Client.
@@ -71,6 +72,8 @@ To use RbNaCl, you will need to install libsodium:
 
 https://github.com/jedisct1/libsodium
 
+At least version `1.0.0` is recommended.
+
 For OS X users, libsodium is available via homebrew and can be installed with:
 
     brew install libsodium
@@ -195,5 +198,5 @@ Sure, here you go:
 
 ## License
 
-Copyright (c) 2012-2015 Jonathan Stott, Tony Arcieri.
-Distributed under the MIT License. See LICENSE.txt for further details.
+Copyright (c) 2012-2016 Jonathan Stott, Tony Arcieri. Distributed under the MIT License.
+See LICENSE.txt for further details.

data/lib/rbnacl.rb

@@ -67,9 +67,10 @@ module RbNaCl
   require "rbnacl/password_hash"
   require "rbnacl/password_hash/scrypt"
 
-  # HMAC: SHA256 and SHA512256
+  # HMAC: SHA256/512 and SHA512256
   require "rbnacl/hmac/sha256"
   require "rbnacl/hmac/sha512256"
+  require "rbnacl/hmac/sha512"
 
   #
   # Bind aliases used by the public API

data/lib/rbnacl/auth.rb

@@ -70,7 +70,7 @@ module RbNaCl
     def verify(authenticator, message)
       auth = authenticator.to_s
       Util.check_length(auth, tag_bytes, "Provided authenticator")
-      verify_message(auth, message) || fail(BadAuthenticatorError, "Invalid authenticator provided, message is corrupt")
+      verify_message(auth, message) || raise(BadAuthenticatorError, "Invalid authenticator provided, message is corrupt")
     end
 
     # The crypto primitive for this authenticator instance
@@ -111,11 +111,11 @@ module RbNaCl
     private
 
     def compute_authenticator(_authenticator, _message)
-      fail NotImplementedError
+      raise NotImplementedError
     end
 
     def verify_message(_authenticator, _message)
-      fail NotImplementedError
+      raise NotImplementedError
     end
   end
 end

data/lib/rbnacl/boxes/curve25519xsalsa20poly1305.rb

@@ -99,7 +99,7 @@ module RbNaCl
       def initialize(public_key, private_key)
         @public_key   = public_key.is_a?(PublicKey) ? public_key : PublicKey.new(public_key)
         @private_key  = private_key.is_a?(PrivateKey) ? private_key : PrivateKey.new(private_key)
-        fail IncorrectPrimitiveError unless @public_key.primitive == primitive && @private_key.primitive == primitive
+        raise IncorrectPrimitiveError unless @public_key.primitive == primitive && @private_key.primitive == primitive
       end
 
       # Encrypts a message
@@ -121,10 +121,10 @@ module RbNaCl
         msg = Util.prepend_zeros(ZEROBYTES, message)
         ct  = Util.zeros(msg.bytesize)
 
-        self.class.box_curve25519xsalsa20poly1305_afternm(ct, msg, msg.bytesize, nonce, beforenm) || fail(CryptoError, "Encryption failed")
+        self.class.box_curve25519xsalsa20poly1305_afternm(ct, msg, msg.bytesize, nonce, beforenm) || raise(CryptoError, "Encryption failed")
         Util.remove_zeros(BOXZEROBYTES, ct)
       end
-      alias_method :encrypt, :box
+      alias encrypt box
 
       # Decrypts a ciphertext
       #
@@ -146,11 +146,11 @@ module RbNaCl
         message = Util.zeros(ct.bytesize)
 
         success = self.class.box_curve25519xsalsa20poly1305_open_afternm(message, ct, ct.bytesize, nonce, beforenm)
-        fail CryptoError, "Decryption failed. Ciphertext failed verification." unless success
+        raise CryptoError, "Decryption failed. Ciphertext failed verification." unless success
 
         Util.remove_zeros(ZEROBYTES, message)
       end
-      alias_method :decrypt, :open
+      alias decrypt open
 
       # The crypto primitive for the box class
       #
@@ -179,7 +179,7 @@ module RbNaCl
         @_key ||= begin
           key = Util.zeros(BEFORENMBYTES)
           success = self.class.box_curve25519xsalsa20poly1305_beforenm(key, @public_key.to_s, @private_key.to_s)
-          fail CryptoError, "Failed to derive shared key" unless success
+          raise CryptoError, "Failed to derive shared key" unless success
           key
         end
       end

data/lib/rbnacl/boxes/curve25519xsalsa20poly1305/private_key.rb

@@ -52,7 +52,7 @@ module RbNaCl
         def self.generate
           pk = Util.zeros(Boxes::Curve25519XSalsa20Poly1305::PUBLICKEYBYTES)
           sk = Util.zeros(Boxes::Curve25519XSalsa20Poly1305::PRIVATEKEYBYTES)
-          box_curve25519xsalsa20poly1305_keypair(pk, sk) || fail(CryptoError, "Failed to generate a key pair")
+          box_curve25519xsalsa20poly1305_keypair(pk, sk) || raise(CryptoError, "Failed to generate a key pair")
           new(sk)
         end
 

data/lib/rbnacl/hash.rb

@@ -25,7 +25,7 @@ module RbNaCl
     def self.sha256(data)
       data   = data.to_str
       digest = Util.zeros(SHA256::BYTES)
-      SHA256.hash_sha256(digest, data, data.bytesize) || fail(CryptoError, "Hashing failed!")
+      SHA256.hash_sha256(digest, data, data.bytesize) || raise(CryptoError, "Hashing failed!")
       digest
     end
 
@@ -40,7 +40,7 @@ module RbNaCl
     # @return [String] The SHA-512 hash digest as raw bytes
     def self.sha512(data)
       digest = Util.zeros(SHA512::BYTES)
-      SHA512.hash_sha512(digest, data, data.bytesize) || fail(CryptoError, "Hashing failed!")
+      SHA512.hash_sha512(digest, data, data.bytesize) || raise(CryptoError, "Hashing failed!")
       digest
     end
 

data/lib/rbnacl/hash/blake2b.rb

@@ -47,15 +47,15 @@ module RbNaCl
 
         if @key
           @key_size = @key.bytesize
-          fail LengthError, "key too short" if @key_size < KEYBYTES_MIN
-          fail LengthError, "key too long"  if @key_size > KEYBYTES_MAX
+          raise LengthError, "key too short" if @key_size < KEYBYTES_MIN
+          raise LengthError, "key too long"  if @key_size > KEYBYTES_MAX
         else
           @key_size = 0
         end
 
         @digest_size = opts.fetch(:digest_size, BYTES_MAX)
-        fail LengthError, "digest size too short" if @digest_size < BYTES_MIN
-        fail LengthError, "digest size too long"  if @digest_size > BYTES_MAX
+        raise LengthError, "digest size too short" if @digest_size < BYTES_MIN
+        raise LengthError, "digest size too long"  if @digest_size > BYTES_MAX
 
         @personal = opts.fetch(:personal, EMPTY_PERSONAL)
         @personal = Util.zero_pad(PERSONALBYTES, @personal)
@@ -72,7 +72,7 @@ module RbNaCl
       def digest(message)
         digest = Util.zeros(@digest_size)
         self.class.generichash_blake2b(digest, @digest_size, message, message.bytesize, @key, @key_size, @salt, @personal) ||
-          fail(CryptoError, "Hashing failed!")
+          raise(CryptoError, "Hashing failed!")
         digest
       end
     end

data/lib/rbnacl/hmac/sha512.rb

@@ -0,0 +1,42 @@
+# encoding: binary
+module RbNaCl
+  module HMAC
+    # Computes an authenticator as HMAC-SHA-512
+    #
+    # The authenticator can be used at a later time to verify the provenance of
+    # the message by recomputing the HMAC over the message and then comparing it to
+    # the provided authenticator.  The class provides methods for generating
+    # signatures and also has a constant-time implementation for checking them.
+    #
+    # This is a secret key authenticator, i.e. anyone who can verify signatures
+    # can also create them.
+    #
+    # @see http://nacl.cr.yp.to/auth.html
+    class SHA512 < Auth
+      extend Sodium
+
+      sodium_type :auth
+      sodium_primitive :hmacsha512
+      sodium_constant :BYTES
+      sodium_constant :KEYBYTES
+
+      sodium_function :auth_hmacsha512,
+                      :crypto_auth_hmacsha512,
+                      [:pointer, :pointer, :ulong_long, :pointer]
+
+      sodium_function :auth_hmacsha512_verify,
+                      :crypto_auth_hmacsha512_verify,
+                      [:pointer, :pointer, :ulong_long, :pointer]
+
+      private
+
+      def compute_authenticator(authenticator, message)
+        self.class.auth_hmacsha512(authenticator, message, message.bytesize, key)
+      end
+
+      def verify_message(authenticator, message)
+        self.class.auth_hmacsha512_verify(authenticator, message, message.bytesize, key)
+      end
+    end
+  end
+end

data/lib/rbnacl/key_comparator.rb

@@ -22,14 +22,7 @@ module RbNaCl
       else
         return nil
       end
-
-      if Util.verify32(to_bytes, other)
-        return 0
-      elsif to_bytes > other
-        return 1
-      else
-        return -1
-      end
+      compare32(other)
     end
 
     # equality operator
@@ -55,5 +48,17 @@ module RbNaCl
       end
       Util.verify32(to_bytes, other)
     end
+
+    private
+
+    def compare32(other)
+      if Util.verify32(to_bytes, other)
+        0
+      elsif to_bytes > other
+        1
+      else
+        -1
+      end
+    end
   end
 end

data/lib/rbnacl/password_hash/scrypt.rb

@@ -17,52 +17,45 @@ module RbNaCl
     # on GPUs or FPGAs) with additional computation.
     class SCrypt
       extend Sodium
+      sodium_type :pwhash
+      sodium_primitive :scryptsalsa208sha256
+
+      sodium_constant :SALTBYTES
+
+      sodium_function :scrypt,
+                      :crypto_pwhash_scryptsalsa208sha256,
+                      [:pointer, :ulong_long, :pointer, :ulong_long, :pointer, :ulong_long, :size_t]
+
+      # Create a new SCrypt password hash object
+      #
+      # @param [Integer] opslimit the CPU cost (e.g. 2**20)
+      # @param [Integer] memlimit the memory cost (e.g. 2**24)
+      #
+      # @return [RbNaCl::PasswordHash::SCrypt] An SCrypt password hasher object
+      def initialize(opslimit, memlimit, digest_size = 64)
+        # TODO: sanity check these parameters
+        @opslimit = opslimit
+        @memlimit = memlimit
+
+        # TODO: check digest size validity
+        # raise LengthError, "digest size too short" if @digest_size < BYTES_MIN
+        # raise LengthError, "digest size too long"  if @digest_size > BYTES_MAX
+
+        @digest_size = digest_size
+      end
 
-      begin
-        sodium_type :pwhash
-        sodium_primitive :scryptsalsa208sha256
-
-        sodium_constant :SALTBYTES
-
-        sodium_function :scrypt,
-                        :crypto_pwhash_scryptsalsa208sha256,
-                        [:pointer, :ulong_long, :pointer, :ulong_long, :pointer, :ulong_long, :size_t]
-
-        # Create a new SCrypt password hash object
-        #
-        # @param [Integer] opslimit the CPU cost (e.g. 2**20)
-        # @param [Integer] memlimit the memory cost (e.g. 2**24)
-        #
-        # @return [RbNaCl::PasswordHash::SCrypt] An SCrypt password hasher object
-        def initialize(opslimit, memlimit, digest_size = 64)
-          # TODO: sanity check these parameters
-          @opslimit = opslimit
-          @memlimit = memlimit
-
-          # TODO: check digest size validity
-          # raise LengthError, "digest size too short" if @digest_size < BYTES_MIN
-          # raise LengthError, "digest size too long"  if @digest_size > BYTES_MAX
-
-          @digest_size = digest_size
-        end
-
-        # Calculate an scrypt digest for a given password and salt
-        #
-        # @param [String] password to be hashed
-        # @param [String] salt to make the digest unique
-        #
-        # @return [String] scrypt digest of the string as raw bytes
-        def digest(password, salt)
-          digest = Util.zeros(@digest_size)
-          salt   = Util.check_string(salt, SALTBYTES, "salt")
-
-          self.class.scrypt(digest, @digest_size, password, password.bytesize, salt, @opslimit, @memlimit) || fail(CryptoError, "scrypt failed!")
-          digest
-        end
-      rescue FFI::NotFoundError
-        def initialize(_opslimit, _memlimit, _digest_size = 64)
-          raise NotImplementedError, "scrypt not implemented in this version of libsodium"
-        end
+      # Calculate an scrypt digest for a given password and salt
+      #
+      # @param [String] password to be hashed
+      # @param [String] salt to make the digest unique
+      #
+      # @return [String] scrypt digest of the string as raw bytes
+      def digest(password, salt)
+        digest = Util.zeros(@digest_size)
+        salt   = Util.check_string(salt, SALTBYTES, "salt")
+
+        self.class.scrypt(digest, @digest_size, password, password.bytesize, salt, @opslimit, @memlimit) || raise(CryptoError, "scrypt failed!")
+        digest
       end
     end
   end

data/lib/rbnacl/secret_boxes/xsalsa20poly1305.rb

@@ -68,11 +68,11 @@ module RbNaCl
         ct  = Util.zeros(msg.bytesize)
 
         success = self.class.secretbox_xsalsa20poly1305(ct, msg, msg.bytesize, nonce, @key)
-        fail CryptoError, "Encryption failed" unless success
+        raise CryptoError, "Encryption failed" unless success
 
         Util.remove_zeros(BOXZEROBYTES, ct)
       end
-      alias_method :encrypt, :box
+      alias encrypt box
 
       # Decrypts a ciphertext
       #
@@ -94,11 +94,11 @@ module RbNaCl
         message = Util.zeros(ct.bytesize)
 
         success = self.class.secretbox_xsalsa20poly1305_open(message, ct, ct.bytesize, nonce, @key)
-        fail CryptoError, "Decryption failed. Ciphertext failed verification." unless success
+        raise CryptoError, "Decryption failed. Ciphertext failed verification." unless success
 
         Util.remove_zeros(ZEROBYTES, message)
       end
-      alias_method :decrypt, :open
+      alias decrypt open
 
       # The crypto primitive for the SecretBox instance
       #

data/lib/rbnacl/self_test.rb

@@ -32,8 +32,8 @@ module RbNaCl
       message    = vector :box_message
       ciphertext = vector :box_ciphertext
 
-      fail SelfTestFailure, "failed to generate correct ciphertext" unless box.encrypt(nonce, message) == ciphertext
-      fail SelfTestFailure, "failed to decrypt ciphertext correctly" unless box.decrypt(nonce, ciphertext) == message
+      raise SelfTestFailure, "failed to generate correct ciphertext" unless box.encrypt(nonce, message) == ciphertext
+      raise SelfTestFailure, "failed to decrypt ciphertext correctly" unless box.decrypt(nonce, ciphertext) == message
 
       begin
         passed         = false
@@ -43,7 +43,7 @@ module RbNaCl
       rescue CryptoError
         passed = true
       ensure
-        passed || fail(SelfTestFailure, "failed to detect corrupt ciphertext")
+        passed || raise(SelfTestFailure, "failed to detect corrupt ciphertext")
       end
     end
 
@@ -53,7 +53,7 @@ module RbNaCl
 
       unless verify_key.to_s == vector(:sign_public)
         #:nocov:
-        fail SelfTestFailure, "failed to generate verify key correctly"
+        raise SelfTestFailure, "failed to generate verify key correctly"
         #:nocov:
       end
 
@@ -62,13 +62,13 @@ module RbNaCl
 
       unless signature == vector(:sign_signature)
         #:nocov:
-        fail SelfTestFailure, "failed to generate correct signature"
+        raise SelfTestFailure, "failed to generate correct signature"
         #:nocov:
       end
 
       unless verify_key.verify(signature, message)
         #:nocov:
-        fail SelfTestFailure, "failed to verify a valid signature"
+        raise SelfTestFailure, "failed to verify a valid signature"
         #:nocov:
       end
 
@@ -79,7 +79,7 @@ module RbNaCl
       rescue CryptoError
         passed = true
       ensure
-        passed || fail(SelfTestFailure, "failed to detect corrupt ciphertext")
+        passed || raise(SelfTestFailure, "failed to detect corrupt ciphertext")
       end
     end
 
@@ -87,16 +87,16 @@ module RbNaCl
       message = vector :sha256_message
       digest  = vector :sha256_digest
 
-      fail SelfTestFailure, "failed to generate a correct SHA256 digest" unless RbNaCl::Hash.sha256(message) == digest
+      raise SelfTestFailure, "failed to generate a correct SHA256 digest" unless RbNaCl::Hash.sha256(message) == digest
     end
 
     def hmac_test(klass, tag)
-      authenticator = klass.new(vector(:auth_key))
+      authenticator = klass.new(vector("auth_key_#{klass.key_bytes}".to_sym))
 
       message = vector :auth_message
 
-      fail SelfTestFailure, "#{klass} failed to generate correct authentication tag" unless authenticator.auth(message) == vector(tag)
-      fail SelfTestFailure, "#{klass} failed to verify correct authentication tag" unless authenticator.verify(vector(tag), message)
+      raise SelfTestFailure, "#{klass} failed to generate correct authentication tag" unless authenticator.auth(message) == vector(tag)
+      raise SelfTestFailure, "#{klass} failed to verify correct authentication tag" unless authenticator.verify(vector(tag), message)
 
       begin
         passed = false
@@ -104,7 +104,7 @@ module RbNaCl
       rescue CryptoError
         passed = true
       ensure
-        passed || fail(SelfTestFailure, "failed to detect corrupt ciphertext")
+        passed || raise(SelfTestFailure, "failed to detect corrupt ciphertext")
       end
     end
   end

data/lib/rbnacl/signatures/ed25519/signing_key.rb

@@ -58,7 +58,7 @@ module RbNaCl
           pk = Util.zeros(Ed25519::VERIFYKEYBYTES)
           sk = Util.zeros(Ed25519::SIGNINGKEYBYTES)
 
-          self.class.sign_ed25519_seed_keypair(pk, sk, seed) || fail(CryptoError, "Failed to generate a key pair")
+          self.class.sign_ed25519_seed_keypair(pk, sk, seed) || raise(CryptoError, "Failed to generate a key pair")
 
           @seed        = seed
           @signing_key = sk
@@ -86,6 +86,14 @@ module RbNaCl
           @seed
         end
 
+        # Return the raw 64 byte value of this key
+        #
+        # @return [String] The signature key bytes. Left half is 32-byte
+        #   curve25519 private scalar, right half is 32-byte group element
+        def keypair_bytes
+          @signing_key
+        end
+
         # The crypto primitive this SigningKey class uses for signatures
         #
         # @return [Symbol] The primitive

data/lib/rbnacl/signatures/ed25519/verify_key.rb

@@ -51,7 +51,7 @@ module RbNaCl
           buffer_len = Util.zeros(FFI::Type::LONG_LONG.size)
 
           success = self.class.sign_ed25519_open(buffer, buffer_len, sig_and_msg, sig_and_msg.bytesize, @key)
-          fail(BadSignatureError, "signature was forged/corrupt") unless success
+          raise(BadSignatureError, "signature was forged/corrupt") unless success
 
           true
         end

data/lib/rbnacl/simple_box.rb

@@ -80,7 +80,7 @@ module RbNaCl
       cipher_text = @box.box(nonce, message)
       nonce + cipher_text
     end
-    alias_method :encrypt, :box
+    alias encrypt box
 
     # Decrypts the ciphertext with a random nonce
     #
@@ -96,7 +96,7 @@ module RbNaCl
       nonce, ciphertext = extract_nonce(enciphered_message.to_s)
       @box.open(nonce, ciphertext)
     end
-    alias_method :decrypt, :open
+    alias decrypt open
 
     private
 

data/lib/rbnacl/sodium/version.rb

@@ -4,7 +4,7 @@ module RbNaCl
   module Sodium
     # libsodium version API
     module Version
-      MINIMUM_LIBSODIUM_VERSION = "0.4.3"
+      MINIMUM_LIBSODIUM_VERSION = "0.4.3".freeze
 
       extend Sodium
       attach_function :sodium_version_string, [], :string
@@ -17,7 +17,7 @@ module RbNaCl
 
       case installed_version <=> minimum_version
       when -1
-        fail "Sorry, you need to install libsodium #{MINIMUM_LIBSODIUM_VERSION}+. You have #{Version::STRING} installed"
+        raise "Sorry, you need to install libsodium #{MINIMUM_LIBSODIUM_VERSION}+. You have #{Version::STRING} installed"
       end
     end
   end

data/lib/rbnacl/test_vectors.rb

@@ -122,7 +122,9 @@ module RbNaCl
     # Auth test vectors
     # Taken from NaCl distribution
     #
-    auth_key:     "eea6a7251c1e72916d11c2cb214d3c252539121d8e234e652d651fa4c8cff880",
+    auth_key_32:  "eea6a7251c1e72916d11c2cb214d3c252539121d8e234e652d651fa4c8cff880",
+    auth_key_64:  "eaaa4c73ef13e7e9a53011304c5be141da9c3713b5ca822037ed57aded31b70a" \
+                  "50a0dd80843d580fe5b57e470bb534333e907a624cf02873c6b9eaba70e0fc7e",
     auth_message: "8e993b9f48681273c29650ba32fc76ce48332ea7164d96a4476fb8c531a1186a" \
                   "c0dfc17c98dce87b4da7f011ec48c97271d2c20f9b928fe2270d6fb863d51738" \
                   "b48eeee314a7cc8ab932164548e526ae90224368517acfeabd6bb3732bc0e9da" \
@@ -131,6 +133,8 @@ module RbNaCl
     auth_onetime: "f3ffc7703f9400e52a7dfb4b3d3305d9",
     # self-created (FIXME: find standard test vectors)
     auth_hmacsha256:    "7f7b9b707e8790ca8620ff94df5e6533ddc8e994060ce310c9d7de04d44aabc3",
-    auth_hmacsha512256: "b2a31b8d4e01afcab2ee545b5caf4e3d212a99d7b3a116a97cec8e83c32e107d"
-  }
+    auth_hmacsha512256: "b2a31b8d4e01afcab2ee545b5caf4e3d212a99d7b3a116a97cec8e83c32e107d",
+    auth_hmacsha512:    "b2a31b8d4e01afcab2ee545b5caf4e3d212a99d7b3a116a97cec8e83c32e107d" \
+                        "270e3921f69016c267a63ab4b226449a0dee0dc7dcb897a9bce9d27d788f8e8d"
+  }.freeze
 end

data/lib/rbnacl/util.rb

@@ -60,7 +60,7 @@ module RbNaCl
       if len == n
         message
       elsif len > n
-        fail LengthError, "String too long for zero-padding to #{n} bytes"
+        raise LengthError, "String too long for zero-padding to #{n} bytes"
       else
         message + zeros(n - len)
       end
@@ -78,15 +78,15 @@ module RbNaCl
     # @param description [String] Description of the string (used in the error)
     def check_length(string, length, description)
       if string.nil?
-        fail LengthError,
-             "#{description} was nil (Expected #{length.to_int})",
-             caller
+        raise LengthError,
+              "#{description} was nil (Expected #{length.to_int})",
+              caller
       end
 
       if string.bytesize != length.to_int
-        fail LengthError,
-             "#{description} was #{string.bytesize} bytes (Expected #{length.to_int})",
-             caller
+        raise LengthError,
+              "#{description} was #{string.bytesize} bytes (Expected #{length.to_int})",
+              caller
       end
       true
     end
@@ -104,12 +104,12 @@ module RbNaCl
     # @param description [String] Description of the string (used in the error)
     def check_string(string, length, description)
       unless string.respond_to? :to_str
-        fail TypeError, "can't convert #{string.class} into String with #to_str"
+        raise TypeError, "can't convert #{string.class} into String with #to_str"
       end
 
       string = string.to_str
       unless string.encoding == Encoding::BINARY
-        fail EncodingError, "strings must use BINARY encoding (got #{string.encoding})"
+        raise EncodingError, "strings must use BINARY encoding (got #{string.encoding})"
       end
       check_length(string, length, description)
 

data/lib/rbnacl/version.rb

@@ -3,5 +3,5 @@
 # NaCl/libsodium for Ruby
 module RbNaCl
   # The library's version
-  VERSION = "3.3.0"
+  VERSION = "3.4.0".freeze
 end

data/spec/rbnacl/hmac/sha512_spec.rb

@@ -0,0 +1,8 @@
+# encoding: binary
+require "spec_helper"
+
+RSpec.describe RbNaCl::HMAC::SHA512 do
+  let(:tag) { vector :auth_hmacsha512 }
+
+  include_examples "authenticator"
+end

data/spec/rbnacl/signatures/ed25519/signing_key_spec.rb

@@ -20,6 +20,11 @@ RSpec.describe RbNaCl::SigningKey do
     expect(subject.to_bytes).to eq signing_key
   end
 
+  it "serializes the internal signing key to bytes" do
+    expect(subject.keypair_bytes.length).to eq 64
+    expect(subject.keypair_bytes).to eq "\xB1\x8E\x1D\x00E\x99^\xC3\xD0\x10\xC3\x87\xCC\xFE\xB9\x84\xD7\x83\xAF\x8F\xBB\x0F@\xFA}\xB1&\xD8\x89\xF6\xDA\xDDw\xF4\x8BY\xCA\xED\xA7wQ\xED\x13\x8B\x0E\xC6g\xFFP\xF8v\x8C%\xD4\x83\t\xA8\xF3\x86\xA2\xBA\xD1\x87\xFB"
+  end
+
   include_examples "key equality" do
     let(:key_bytes) { signing_key }
     let(:key)       { described_class.new(key_bytes) }

data/spec/shared/authenticator.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 RSpec.shared_examples "authenticator" do
-  let(:key)     { vector :auth_key }
+  let(:key)     { vector "auth_key_#{described_class.key_bytes}".to_sym }
   let(:message) { vector :auth_message }
 
   context ".new" do
@@ -17,11 +17,11 @@ RSpec.shared_examples "authenticator" do
     end
 
     it "raises ArgumentError on a key which is too long" do
-      expect { described_class.new("\0" * 33) }.to raise_error(ArgumentError)
+      expect { described_class.new("\0" * described_class.key_bytes.succ) }.to raise_error(ArgumentError)
     end
 
     it "raises ArgumentError on a key which is too short" do
-      expect { described_class.new("\0" * 31) }.to raise_error(ArgumentError)
+      expect { described_class.new("\0" * described_class.key_bytes.pred) }.to raise_error(ArgumentError)
     end
   end
 
@@ -35,7 +35,7 @@ RSpec.shared_examples "authenticator" do
     end
 
     it "raises ArgumentError on a key which is too long" do
-      expect { described_class.auth("\0" * 33, message) }.to raise_error(ArgumentError)
+      expect { described_class.auth("\0" * described_class.key_bytes.succ, message) }.to raise_error(ArgumentError)
     end
   end
 
@@ -49,7 +49,7 @@ RSpec.shared_examples "authenticator" do
     end
 
     it "raises ArgumentError on a key which is too long" do
-      expect { described_class.verify("\0" * 33, tag, message) }.to raise_error(ArgumentError)
+      expect { described_class.verify("\0" * described_class.key_bytes.succ, tag, message) }.to raise_error(ArgumentError)
     end
 
     it "fails to validate an invalid authenticator" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbnacl
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Tony Arcieri
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - bascule.cert
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -105,6 +105,7 @@ files:
 - lib/rbnacl/hash/sha256.rb
 - lib/rbnacl/hash/sha512.rb
 - lib/rbnacl/hmac/sha256.rb
+- lib/rbnacl/hmac/sha512.rb
 - lib/rbnacl/hmac/sha512256.rb
 - lib/rbnacl/init.rb
 - lib/rbnacl/key_comparator.rb
@@ -134,6 +135,7 @@ files:
 - spec/rbnacl/hash_spec.rb
 - spec/rbnacl/hmac/sha256_spec.rb
 - spec/rbnacl/hmac/sha512256_spec.rb
+- spec/rbnacl/hmac/sha512_spec.rb
 - spec/rbnacl/password_hash/scrypt_spec.rb
 - spec/rbnacl/random_spec.rb
 - spec/rbnacl/secret_box_spec.rb
@@ -183,6 +185,7 @@ test_files:
 - spec/rbnacl/hash_spec.rb
 - spec/rbnacl/hmac/sha256_spec.rb
 - spec/rbnacl/hmac/sha512256_spec.rb
+- spec/rbnacl/hmac/sha512_spec.rb
 - spec/rbnacl/password_hash/scrypt_spec.rb
 - spec/rbnacl/random_spec.rb
 - spec/rbnacl/secret_box_spec.rb
@@ -195,4 +198,3 @@ test_files:
 - spec/shared/key_equality.rb
 - spec/shared/serializable.rb
 - spec/spec_helper.rb
-has_rdoc: