rbnacl 3.1.2 → 3.2.0

data/lib/rbnacl/serializable.rb

@@ -2,14 +2,19 @@
 module RbNaCl
   # Serialization features shared across all "key-like" classes
   module Serializable
-    def to_s;   to_bytes; end
-    def to_str; to_bytes; end
+    def to_s
+      to_bytes
+    end
+
+    def to_str
+      to_bytes
+    end
 
     # Inspect this key
     #
     # @return [String] a string representing this key
     def inspect
-      "#<#{self.class}:#{Util.bin2hex(to_bytes)[0,8]}>"
+      "#<#{self.class}:#{Util.bin2hex(to_bytes)[0, 8]}>"
     end
   end
-end
+end

data/lib/rbnacl/signatures/ed25519.rb

@@ -1,6 +1,7 @@
 # encoding: binary
 module RbNaCl
   module Signatures
+    # The EdDSA signature system implemented using the Ed25519 elliptic curve
     module Ed25519
       extend Sodium
 

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

@@ -23,7 +23,7 @@ module RbNaCl
         include KeyComparator
         include Serializable
 
-        extend  Sodium
+        extend Sodium
 
         sodium_type      :sign
         sodium_primitive :ed25519
@@ -58,10 +58,11 @@ module RbNaCl
           pk = Util.zeros(Ed25519::VERIFYKEYBYTES)
           sk = Util.zeros(Ed25519::SIGNINGKEYBYTES)
 
-          self.class.sign_ed25519_seed_keypair(pk, sk, seed) || raise(CryptoError, "Failed to generate a key pair")
+          self.class.sign_ed25519_seed_keypair(pk, sk, seed) || fail(CryptoError, "Failed to generate a key pair")
 
-          @seed, @signing_key = seed, sk
-          @verify_key = VerifyKey.new(pk)
+          @seed        = seed
+          @signing_key = sk
+          @verify_key  = VerifyKey.new(pk)
         end
 
         # Sign a message using this key
@@ -81,23 +82,30 @@ module RbNaCl
         # Return the raw seed value of this key
         #
         # @return [String] seed used to create this key
-        def to_bytes; @seed; end
+        def to_bytes
+          @seed
+        end
 
         # The crypto primitive this SigningKey class uses for signatures
         #
         # @return [Symbol] The primitive
-        def primitive; self.class.primitive; end
+        def primitive
+          self.class.primitive
+        end
 
         # The size of signatures generated by the SigningKey class
         #
         # @return [Integer] The number of bytes in a signature
-        def self.signature_bytes; Ed25519::SIGNATUREBYTES; end
+        def self.signature_bytes
+          Ed25519::SIGNATUREBYTES
+        end
 
         # The size of signatures generated by the SigningKey instance
         #
         # @return [Integer] The number of bytes in a signature
-        def signature_bytes; Ed25519::SIGNATUREBYTES; end
-
+        def signature_bytes
+          Ed25519::SIGNATUREBYTES
+        end
       end
     end
   end

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

@@ -12,7 +12,7 @@ module RbNaCl
         include KeyComparator
         include Serializable
 
-        extend  Sodium
+        extend Sodium
 
         sodium_type      :sign
         sodium_primitive :ed25519
@@ -50,28 +50,39 @@ module RbNaCl
           buffer = Util.zeros(sig_and_msg.bytesize)
           buffer_len = Util.zeros(FFI::Type::LONG_LONG.size)
 
-          self.class.sign_ed25519_open(buffer, buffer_len, sig_and_msg, sig_and_msg.bytesize, @key) || raise(BadSignatureError, "signature was forged/corrupt")
+          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
+
+          true
         end
 
         # Return the raw key in byte format
         #
         # @return [String] raw key as bytes
-        def to_bytes; @key; end
+        def to_bytes
+          @key
+        end
 
         # The crypto primitive this VerifyKey class uses for signatures
         #
         # @return [Symbol] The primitive
-        def primitive; self.class.primitive; end
+        def primitive
+          self.class.primitive
+        end
 
         # The size of signatures verified by the VerifyKey class
         #
         # @return [Integer] The number of bytes in a signature
-        def self.signature_bytes; Ed25519::SIGNATUREBYTES; end
+        def self.signature_bytes
+          Ed25519::SIGNATUREBYTES
+        end
 
         # The size of signatures verified by the VerifyKey instance
         #
         # @return [Integer] The number of bytes in a signature
-        def signature_bytes; Ed25519::SIGNATUREBYTES; end
+        def signature_bytes
+          Ed25519::SIGNATUREBYTES
+        end
       end
     end
   end

data/lib/rbnacl/simple_box.rb

@@ -1,5 +1,7 @@
 # encoding: binary
-require 'forwardable'
+require "forwardable"
+
+# NaCl/libsodium for Ruby
 module RbNaCl
   # The simplest nonce strategy that could possibly work
   #
@@ -78,7 +80,7 @@ module RbNaCl
       cipher_text = @box.box(nonce, message)
       nonce + cipher_text
     end
-    alias encrypt box
+    alias_method :encrypt, :box
 
     # Decrypts the ciphertext with a random nonce
     #
@@ -94,9 +96,10 @@ module RbNaCl
       nonce, ciphertext = extract_nonce(enciphered_message.to_s)
       @box.open(nonce, ciphertext)
     end
-    alias decrypt open
+    alias_method :decrypt, :open
 
     private
+
     def generate_nonce
       Random.random_bytes(nonce_bytes)
     end

data/lib/rbnacl/sodium.rb

@@ -1,5 +1,5 @@
 # encoding: binary
-require 'ffi'
+require "ffi"
 
 module RbNaCl
   # Provides helpers for defining the libsodium bindings
@@ -9,11 +9,10 @@ module RbNaCl
       if defined?(RBNACL_LIBSODIUM_GEM_LIB_PATH)
         klass.ffi_lib RBNACL_LIBSODIUM_GEM_LIB_PATH
       else
-        klass.ffi_lib 'sodium'
+        klass.ffi_lib "sodium"
       end
     end
 
-
     def sodium_type(type = nil)
       return @type if type.nil?
       @type = type
@@ -28,14 +27,14 @@ module RbNaCl
       sodium_primitive
     end
 
-    def sodium_constant(constant, name=constant)
+    def sodium_constant(constant, name = constant)
       fn = "crypto_#{sodium_type}_#{sodium_primitive}_#{constant.to_s.downcase}"
-      attach_function fn, [], :ulong_long
-      self.const_set(name, self.public_send(fn))
+      attach_function fn, [], :size_t
+      const_set(name, public_send(fn))
     end
 
     def sodium_function(name, function, arguments)
-      self.module_eval <<-eos, __FILE__, __LINE__ + 1
+      module_eval <<-eos, __FILE__, __LINE__ + 1
       attach_function #{function.inspect}, #{arguments.inspect}, :int
       def self.#{name}(*args)
         ret = #{function}(*args)

data/lib/rbnacl/sodium/version.rb

@@ -1,7 +1,8 @@
-require 'rbnacl/sodium'
+require "rbnacl/sodium"
 
 module RbNaCl
   module Sodium
+    # libsodium version API
     module Version
       MINIMUM_LIBSODIUM_VERSION = "0.4.3"
 
@@ -16,7 +17,7 @@ module RbNaCl
 
       case installed_version <=> minimum_version
       when -1
-        raise "Sorry, you need to install libsodium #{MINIMUM_LIBSODIUM_VERSION}+. You have #{Version::STRING} installed"
+        fail "Sorry, you need to install libsodium #{MINIMUM_LIBSODIUM_VERSION}+. You have #{Version::STRING} installed"
       end
     end
   end

data/lib/rbnacl/test_vectors.rb

@@ -1,113 +1,115 @@
 # encoding: binary
+
+# NaCl/libsodium for Ruby
 module RbNaCl
   # Reference library of test vectors used to verify the software is correct
-  TestVectors = {
+  TEST_VECTORS = {
     #
     # Curve25519 test vectors
     # Taken from the NaCl distribution
     #
-    :alice_private  => "77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a",
-    :alice_public   => "8520f0098930a754748b7ddcb43ef75a0dbf3a0d26381af4eba4a98eaa9b4e6a",
-    :bob_private    => "5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb",
-    :bob_public     => "de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f",
-    :alice_mult_bob => "4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742",
+    alice_private: "77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a",
+    alice_public: "8520f0098930a754748b7ddcb43ef75a0dbf3a0d26381af4eba4a98eaa9b4e6a",
+    bob_private: "5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb",
+    bob_public: "de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f",
+    alice_mult_bob: "4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742",
 
     #
     # Box test vectors
     # Taken from the NaCl distribution
     #
-    :secret_key     => "1b27556473e985d462cd51197a9a46c76009549eac6474f206c4ee0844f68389",
-    :box_nonce      => "69696ee955b62b73cd62bda875fc73d68219e0036b7a0b37",
-    :box_message    => "be075fc53c81f2d5cf141316ebeb0c7b5228c52a4c62cbd44b66849b64244ffc" +
-                       "e5ecbaaf33bd751a1ac728d45e6c61296cdc3c01233561f41db66cce314adb31" +
-                       "0e3be8250c46f06dceea3a7fa1348057e2f6556ad6b1318a024a838f21af1fde" +
-                       "048977eb48f59ffd4924ca1c60902e52f0a089bc76897040e082f93776384864" +
+    secret_key: "1b27556473e985d462cd51197a9a46c76009549eac6474f206c4ee0844f68389",
+    box_nonce: "69696ee955b62b73cd62bda875fc73d68219e0036b7a0b37",
+    box_message: "be075fc53c81f2d5cf141316ebeb0c7b5228c52a4c62cbd44b66849b64244ffc" \
+                       "e5ecbaaf33bd751a1ac728d45e6c61296cdc3c01233561f41db66cce314adb31" \
+                       "0e3be8250c46f06dceea3a7fa1348057e2f6556ad6b1318a024a838f21af1fde" \
+                       "048977eb48f59ffd4924ca1c60902e52f0a089bc76897040e082f93776384864" \
                        "5e0705",
 
-    :box_ciphertext => "f3ffc7703f9400e52a7dfb4b3d3305d98e993b9f48681273c29650ba32fc76ce" +
-                       "48332ea7164d96a4476fb8c531a1186ac0dfc17c98dce87b4da7f011ec48c972" +
-                       "71d2c20f9b928fe2270d6fb863d51738b48eeee314a7cc8ab932164548e526ae" +
-                       "90224368517acfeabd6bb3732bc0e9da99832b61ca01b6de56244a9e88d5f9b3" +
+    box_ciphertext: "f3ffc7703f9400e52a7dfb4b3d3305d98e993b9f48681273c29650ba32fc76ce" \
+                       "48332ea7164d96a4476fb8c531a1186ac0dfc17c98dce87b4da7f011ec48c972" \
+                       "71d2c20f9b928fe2270d6fb863d51738b48eeee314a7cc8ab932164548e526ae" \
+                       "90224368517acfeabd6bb3732bc0e9da99832b61ca01b6de56244a9e88d5f9b3" \
                        "7973f622a43d14a6599b1f654cb45a74e355a5",
 
     #
     # Ed25519 test vectors
     # Taken from the Python test vectors: http://ed25519.cr.yp.to/python/sign.input
     #
-    :sign_private   => "b18e1d0045995ec3d010c387ccfeb984d783af8fbb0f40fa7db126d889f6dadd",
-    :sign_public    => "77f48b59caeda77751ed138b0ec667ff50f8768c25d48309a8f386a2bad187fb",
-    :sign_message   => "916c7d1d268fc0e77c1bef238432573c39be577bbea0998936add2b50a653171" +
-                       "ce18a542b0b7f96c1691a3be6031522894a8634183eda38798a0c5d5d79fbd01" +
-                       "dd04a8646d71873b77b221998a81922d8105f892316369d5224c9983372d2313" +
-                       "c6b1f4556ea26ba49d46e8b561e0fc76633ac9766e68e21fba7edca93c4c7460" +
+    sign_private: "b18e1d0045995ec3d010c387ccfeb984d783af8fbb0f40fa7db126d889f6dadd",
+    sign_public: "77f48b59caeda77751ed138b0ec667ff50f8768c25d48309a8f386a2bad187fb",
+    sign_message: "916c7d1d268fc0e77c1bef238432573c39be577bbea0998936add2b50a653171" \
+                       "ce18a542b0b7f96c1691a3be6031522894a8634183eda38798a0c5d5d79fbd01" \
+                       "dd04a8646d71873b77b221998a81922d8105f892316369d5224c9983372d2313" \
+                       "c6b1f4556ea26ba49d46e8b561e0fc76633ac9766e68e21fba7edca93c4c7460" \
                        "376d7f3ac22ff372c18f613f2ae2e856af40",
-    :sign_signature => "6bd710a368c1249923fc7a1610747403040f0cc30815a00f9ff548a896bbda0b" +
+    sign_signature: "6bd710a368c1249923fc7a1610747403040f0cc30815a00f9ff548a896bbda0b" \
                        "4eb2ca19ebcf917f0f34200a9edbad3901b64ab09cc5ef7b9bcc3c40c0ff7509",
 
     #
     # SHA256 test vectors
     # Taken from the NSRL test vectors: http://www.nsrl.nist.gov/testdata/
-    :sha256_message => "6162636462636465636465666465666765666768666768696768696a68696a6b" +
+    sha256_message: "6162636462636465636465666465666765666768666768696768696a68696a6b" \
                        "696a6b6c6a6b6c6d6b6c6d6e6c6d6e6f6d6e6f706e6f7071",
-    :sha256_digest  => "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1",
-    :sha256_empty   => "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+    sha256_digest: "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1",
+    sha256_empty: "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
 
     #
     # SHA512 test vectors
     # self-created (FIXME: find standard test vectors)
-    :sha512_message => "54686520717569636b2062726f776e20666f78206a756d7073206f7665722074" + 
+    sha512_message: "54686520717569636b2062726f776e20666f78206a756d7073206f7665722074" \
                        "6865206c617a7920646f672e",
-    :sha512_digest  => "91ea1245f20d46ae9a037a989f54f1f790f0a47607eeb8a14d12890cea77a1bb" +
+    sha512_digest: "91ea1245f20d46ae9a037a989f54f1f790f0a47607eeb8a14d12890cea77a1bb" \
                        "c6c7ed9cf205e67b7f2b8fd4c7dfd3a7a8617e45f3c463d481c7e586c39ac1ed",
-    :sha512_empty   => "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce" +
+    sha512_empty: "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce" \
                        "47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e",
 
     # Blake2b test vectors
     # self-created? (TODO: double check, fix)
-    :blake2b_message => "54686520717569636b2062726f776e20666f78206a756d7073206f7665722074" + 
+    blake2b_message: "54686520717569636b2062726f776e20666f78206a756d7073206f7665722074" \
                         "6865206c617a7920646f67",
-    :blake2b_digest  => "a8add4bdddfd93e4877d2746e62817b116364a1fa7bc148d95090bc7333b3673" +
+    blake2b_digest: "a8add4bdddfd93e4877d2746e62817b116364a1fa7bc148d95090bc7333b3673" \
                         "f82401cf7aa2e4cb1ecd90296e3f14cb5413f8ed77be73045b13914cdcd6a918",
-    :blake2b_empty   => "786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419" +
+    blake2b_empty: "786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419" \
                         "d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce",
 
     # from the Blake2 paper(?) (TODO: double check)
-    :blake2b_keyed_message => "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f" +
-                              "202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f" +
-                              "404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f" +
-                              "606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f" +
-                              "808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f" +
-                              "a0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebf" +
-                              "c0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedf" +
+    blake2b_keyed_message: "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f" \
+                              "202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f" \
+                              "404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f" \
+                              "606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f" \
+                              "808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f" \
+                              "a0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebf" \
+                              "c0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedf" \
                               "e0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfe",
-    :blake2b_key           => "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f" +
+    blake2b_key: "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f" \
                               "202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f",
-    :blake2b_keyed_digest  => "142709d62e28fcccd0af97fad0f8465b971e82201dc51070faa0372aa43e9248" +
+    blake2b_keyed_digest: "142709d62e28fcccd0af97fad0f8465b971e82201dc51070faa0372aa43e9248" \
                               "4be1c1e73ba10906d5d1853db6a4106e0a7bf9800d373d6dee2d46d62ef2a461",
 
     # scrypt test vectors
     # Taken from http://tools.ietf.org/html/draft-josefsson-scrypt-kdf-01#page-14
-    :scrypt_password => "4a857e2ee8aa9b6056f2424e84d24a72473378906ee04a46cb05311502d5250b" +
-                        "82ad86b83c8f20a23dbb74f6da60b0b6ecffd67134d45946ac8ebfb3064294bc" + 
+    scrypt_password: "4a857e2ee8aa9b6056f2424e84d24a72473378906ee04a46cb05311502d5250b" \
+                        "82ad86b83c8f20a23dbb74f6da60b0b6ecffd67134d45946ac8ebfb3064294bc" \
                         "097d43ced68642bfb8bbbdd0f50b30118f5e",
-    :scrypt_salt     => "39d82eef32010b8b79cc5ba88ed539fbaba741100f2edbeca7cc171ffeabf258",
-    :scrypt_opslimit => 758010,
-    :scrypt_memlimit => 5432947,
-    :scrypt_digest   => "bcc5c2fd785e4781d1201ed43d84925537e2a540d3de55f5812f29e9dd0a4a00" + 
+    scrypt_salt: "39d82eef32010b8b79cc5ba88ed539fbaba741100f2edbeca7cc171ffeabf258",
+    scrypt_opslimit: 758_010,
+    scrypt_memlimit: 5_432_947,
+    scrypt_digest: "bcc5c2fd785e4781d1201ed43d84925537e2a540d3de55f5812f29e9dd0a4a00" \
                         "451a5c8ddbb4862c03d45c75bf91b7fb49265feb667ad5c899fdbf2ca19eac67",
 
     # Auth test vectors
     # Taken from NaCl distribution
     #
-    :auth_key           => "eea6a7251c1e72916d11c2cb214d3c252539121d8e234e652d651fa4c8cff880",
-    :auth_message       => "8e993b9f48681273c29650ba32fc76ce48332ea7164d96a4476fb8c531a1186a" +
-                           "c0dfc17c98dce87b4da7f011ec48c97271d2c20f9b928fe2270d6fb863d51738" +
-                           "b48eeee314a7cc8ab932164548e526ae90224368517acfeabd6bb3732bc0e9da" +
-                           "99832b61ca01b6de56244a9e88d5f9b37973f622a43d14a6599b1f654cb45a74" +
+    auth_key: "eea6a7251c1e72916d11c2cb214d3c252539121d8e234e652d651fa4c8cff880",
+    auth_message: "8e993b9f48681273c29650ba32fc76ce48332ea7164d96a4476fb8c531a1186a" \
+                           "c0dfc17c98dce87b4da7f011ec48c97271d2c20f9b928fe2270d6fb863d51738" \
+                           "b48eeee314a7cc8ab932164548e526ae90224368517acfeabd6bb3732bc0e9da" \
+                           "99832b61ca01b6de56244a9e88d5f9b37973f622a43d14a6599b1f654cb45a74" \
                            "e355a5",
-    :auth_onetime       => "f3ffc7703f9400e52a7dfb4b3d3305d9",
+    auth_onetime: "f3ffc7703f9400e52a7dfb4b3d3305d9",
     # self-created (FIXME: find standard test vectors)
-    :auth_hmacsha256    => "7f7b9b707e8790ca8620ff94df5e6533ddc8e994060ce310c9d7de04d44aabc3",
-    :auth_hmacsha512256 => "b2a31b8d4e01afcab2ee545b5caf4e3d212a99d7b3a116a97cec8e83c32e107d"
+    auth_hmacsha256: "7f7b9b707e8790ca8620ff94df5e6533ddc8e994060ce310c9d7de04d44aabc3",
+    auth_hmacsha512256: "b2a31b8d4e01afcab2ee545b5caf4e3d212a99d7b3a116a97cec8e83c32e107d"
   }
 end

data/lib/rbnacl/util.rb

@@ -6,7 +6,9 @@ module RbNaCl
 
     sodium_function :c_verify16, :crypto_verify_16, [:pointer, :pointer]
     sodium_function :c_verify32, :crypto_verify_32, [:pointer, :pointer]
+
     module_function
+
     # Returns a string of n zeros
     #
     # Lots of the functions require us to create strings to pass into functions of a specified size.
@@ -14,11 +16,11 @@ module RbNaCl
     # @param [Integer] n the size of the string to make
     #
     # @return [String] A nice collection of zeros
-    def zeros(n=32)
+    def zeros(n = 32)
       zeros = "\0" * n
       # make sure they're 8-bit zeros, not 7-bit zeros.  Otherwise we might get
       # encoding errors later
-      zeros.respond_to?(:force_encoding) ? zeros.force_encoding('ASCII-8BIT') : zeros
+      zeros.respond_to?(:force_encoding) ? zeros.force_encoding("ASCII-8BIT") : zeros
     end
 
     # Prepends a message with zeros
@@ -57,15 +59,15 @@ module RbNaCl
     # @param description [String] Description of the string (used in the error)
     def check_length(string, length, description)
       if string.nil?
-        raise LengthError,
-          "#{description} was nil (Expected #{length.to_int})",
-          caller
+        fail LengthError,
+             "#{description} was nil (Expected #{length.to_int})",
+             caller
       end
 
       if string.bytesize != length.to_int
-        raise LengthError,
-              "#{description} was #{string.bytesize} bytes (Expected #{length.to_int})",
-              caller
+        fail LengthError,
+             "#{description} was #{string.bytesize} bytes (Expected #{length.to_int})",
+             caller
       end
       true
     end
@@ -83,12 +85,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
-        raise TypeError, "can't convert #{string.class} into String with #to_str"
+        fail TypeError, "can't convert #{string.class} into String with #to_str"
       end
 
       string = string.to_str
       unless string.encoding == Encoding::BINARY
-        raise EncodingError, "strings must use BINARY encoding (got #{string.encoding})"
+        fail EncodingError, "strings must use BINARY encoding (got #{string.encoding})"
       end
       check_length(string, length, description)
 
@@ -180,4 +182,3 @@ module RbNaCl
     end
   end
 end
-