RubyCrypto · tarcieri · Nov 21, 2017 · Nov 21, 2017
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,11 +1,8 @@
 AllCops:
+  TargetRubyVersion: 2.4
   DisplayCopNames: true
-  Include:
-    - '**/Rakefile'
   Exclude:
-    - 'spec/**/*'
     - 'vendor/**/*'
-    - 'lib/rbnacl/test_vectors.rb'
 
 #
 # Metrics
@@ -14,25 +11,39 @@ AllCops:
 Metrics/AbcSize:
   Max: 20
 
+Metrics/BlockLength:
+  Max: 128
+
 Metrics/ClassLength:
-  Max: 150
+  Max: 128
+
+Metrics/LineLength:
+  Max: 128
 
 Metrics/MethodLength:
-  Max: 25
+  CountComments: false
+  Max: 50
+
+Metrics/CyclomaticComplexity:
+  Max: 15
+
+Metrics/PerceivedComplexity:
+  Max: 15
 
 #
-# Style
+# Performance
 #
 
-LineLength:
-  Max: 128
+Performance/UnfreezeString:
+  Enabled: false
+
+#
+# Style
+#
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
-Style/SpaceBeforeFirstArg:
-  Enabled: false
-
 Style/GlobalVars:
   Enabled: false
 

diff --git a/.ruby-version b/.ruby-version
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec
@@ -7,10 +9,10 @@ group :development do
 end
 
 group :test do
-  gem "rspec"
-  gem "rubocop", "0.46.0"
   gem "coveralls", require: false
   gem "rbnacl-libsodium", ENV["LIBSODIUM_VERSION"]
+  gem "rspec"
+  gem "rubocop", "0.51.0"
 end
 
 group :development, :test do

diff --git a/Guardfile b/Guardfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 

diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 require "bundler/gem_tasks"
 
 Dir[File.expand_path("../tasks/**/*.rake", __FILE__)].each { |task| load task }
 
-task default: %w(spec rubocop)
-task ci:      %w(spec rubocop)
+task default: %w[spec rubocop]
+task ci:      %w[spec rubocop]
diff --git a/lib/rbnacl/aead/chacha20poly1305_ietf.rb b/lib/rbnacl/aead/chacha20poly1305_ietf.rb
@@ -17,11 +17,11 @@ class ChaCha20Poly1305IETF < RbNaCl::AEAD::Base
 
         sodium_function :aead_chacha20poly1305_ietf_encrypt,
                         :crypto_aead_chacha20poly1305_ietf_encrypt,
-                        [:pointer, :pointer, :pointer, :ulong_long, :pointer, :ulong_long, :pointer, :pointer, :pointer]
+                        %i[pointer pointer pointer ulong_long pointer ulong_long pointer pointer pointer]
 
         sodium_function :aead_chacha20poly1305_ietf_decrypt,
                         :crypto_aead_chacha20poly1305_ietf_decrypt,
-                        [:pointer, :pointer, :pointer, :pointer, :ulong_long, :pointer, :ulong_long, :pointer, :pointer]
+                        %i[pointer pointer pointer pointer ulong_long pointer ulong_long pointer pointer]
 
         private
 

diff --git a/lib/rbnacl/aead/chacha20poly1305_legacy.rb b/lib/rbnacl/aead/chacha20poly1305_legacy.rb
@@ -16,11 +16,11 @@ class ChaCha20Poly1305Legacy < RbNaCl::AEAD::Base
 
       sodium_function :aead_chacha20poly1305_encrypt,
                       :crypto_aead_chacha20poly1305_encrypt,
-                      [:pointer, :pointer, :pointer, :ulong_long, :pointer, :ulong_long, :pointer, :pointer, :pointer]
+                      %i[pointer pointer pointer ulong_long pointer ulong_long pointer pointer pointer]
 
       sodium_function :aead_chacha20poly1305_decrypt,
                       :crypto_aead_chacha20poly1305_decrypt,
-                      [:pointer, :pointer, :pointer, :pointer, :ulong_long, :pointer, :ulong_long, :pointer, :pointer]
+                      %i[pointer pointer pointer pointer ulong_long pointer ulong_long pointer pointer]
 
       private
 

diff --git a/lib/rbnacl/boxes/curve25519xsalsa20poly1305.rb b/lib/rbnacl/boxes/curve25519xsalsa20poly1305.rb
@@ -77,15 +77,15 @@ class Curve25519XSalsa20Poly1305
 
       sodium_function :box_curve25519xsalsa20poly1305_beforenm,
                       :crypto_box_curve25519xsalsa20poly1305_beforenm,
-                      [:pointer, :pointer, :pointer]
+                      %i[pointer pointer pointer]
 
       sodium_function :box_curve25519xsalsa20poly1305_open_afternm,
                       :crypto_box_curve25519xsalsa20poly1305_open_afternm,
-                      [:pointer, :pointer, :ulong_long, :pointer, :pointer]
+                      %i[pointer pointer ulong_long pointer pointer]
 
       sodium_function :box_curve25519xsalsa20poly1305_afternm,
                       :crypto_box_curve25519xsalsa20poly1305_afternm,
-                      [:pointer, :pointer, :ulong_long, :pointer, :pointer]
+                      %i[pointer pointer ulong_long pointer pointer]
 
       # Create a new Box
       #

diff --git a/lib/rbnacl/boxes/curve25519xsalsa20poly1305/private_key.rb b/lib/rbnacl/boxes/curve25519xsalsa20poly1305/private_key.rb
@@ -24,7 +24,7 @@ class PrivateKey
 
         sodium_function  :box_curve25519xsalsa20poly1305_keypair,
                          :crypto_box_curve25519xsalsa20poly1305_keypair,
-                         [:pointer, :pointer]
+                         %i[pointer pointer]
 
         # The size of the key, in bytes
         BYTES = Boxes::Curve25519XSalsa20Poly1305::PRIVATEKEYBYTES

diff --git a/lib/rbnacl/group_elements/curve25519.rb b/lib/rbnacl/group_elements/curve25519.rb
@@ -31,7 +31,7 @@ class Curve25519
 
       sodium_function :scalarmult_curve25519,
                       :crypto_scalarmult_curve25519,
-                      [:pointer, :pointer, :pointer]
+                      %i[pointer pointer pointer]
 
       # Number of bytes in a scalar on this curve
       SCALARBYTES = 32

diff --git a/lib/rbnacl/hash/blake2b.rb b/lib/rbnacl/hash/blake2b.rb
@@ -26,19 +26,19 @@ class Blake2b
 
       sodium_function  :generichash_blake2b,
                        :crypto_generichash_blake2b_salt_personal,
-                       [:pointer, :size_t, :pointer, :ulong_long, :pointer, :size_t, :pointer, :pointer]
+                       %i[pointer size_t pointer ulong_long pointer size_t pointer pointer]
 
       sodium_function :generichash_blake2b_init,
                       :crypto_generichash_blake2b_init_salt_personal,
-                      [:pointer, :pointer, :size_t, :size_t, :pointer, :pointer]
+                      %i[pointer pointer size_t size_t pointer pointer]
 
       sodium_function :generichash_blake2b_update,
                       :crypto_generichash_blake2b_update,
-                      [:pointer, :pointer, :ulong_long]
+                      %i[pointer pointer ulong_long]
 
       sodium_function :generichash_blake2b_final,
                       :crypto_generichash_blake2b_final,
-                      [:pointer, :pointer, :size_t]
+                      %i[pointer pointer size_t]
 
       EMPTY_PERSONAL = ("\0" * PERSONALBYTES).freeze
       EMPTY_SALT     = ("\0" * SALTBYTES).freeze

diff --git a/lib/rbnacl/hash/sha256.rb b/lib/rbnacl/hash/sha256.rb
@@ -11,7 +11,7 @@ module SHA256
       sodium_constant :BYTES
       sodium_function :hash_sha256,
                       :crypto_hash_sha256,
-                      [:pointer, :pointer, :ulong_long]
+                      %i[pointer pointer ulong_long]
     end
   end
 end
diff --git a/lib/rbnacl/hash/sha512.rb b/lib/rbnacl/hash/sha512.rb
@@ -11,7 +11,7 @@ module SHA512
       sodium_constant :BYTES
       sodium_function :hash_sha512,
                       :crypto_hash_sha512,
-                      [:pointer, :pointer, :ulong_long]
+                      %i[pointer pointer ulong_long]
     end
   end
 end
diff --git a/lib/rbnacl/hmac/sha256.rb b/lib/rbnacl/hmac/sha256.rb
@@ -24,11 +24,11 @@ class SHA256 < Auth
 
       sodium_function :auth_hmacsha256,
                       :crypto_auth_hmacsha256,
-                      [:pointer, :pointer, :ulong_long, :pointer]
+                      %i[pointer pointer ulong_long pointer]
 
       sodium_function :auth_hmacsha256_verify,
                       :crypto_auth_hmacsha256_verify,
-                      [:pointer, :pointer, :ulong_long, :pointer]
+                      %i[pointer pointer ulong_long pointer]
 
       private
 

diff --git a/lib/rbnacl/hmac/sha512.rb b/lib/rbnacl/hmac/sha512.rb
@@ -24,11 +24,11 @@ class SHA512 < Auth
 
       sodium_function :auth_hmacsha512,
                       :crypto_auth_hmacsha512,
-                      [:pointer, :pointer, :ulong_long, :pointer]
+                      %i[pointer pointer ulong_long pointer]
 
       sodium_function :auth_hmacsha512_verify,
                       :crypto_auth_hmacsha512_verify,
-                      [:pointer, :pointer, :ulong_long, :pointer]
+                      %i[pointer pointer ulong_long pointer]
 
       private
 

diff --git a/lib/rbnacl/hmac/sha512256.rb b/lib/rbnacl/hmac/sha512256.rb
@@ -24,11 +24,11 @@ class SHA512256 < Auth
 
       sodium_function :auth_hmacsha512256,
                       :crypto_auth_hmacsha512256,
-                      [:pointer, :pointer, :ulong_long, :pointer]
+                      %i[pointer pointer ulong_long pointer]
 
       sodium_function :auth_hmacsha512256_verify,
                       :crypto_auth_hmacsha512256_verify,
-                      [:pointer, :pointer, :ulong_long, :pointer]
+                      %i[pointer pointer ulong_long pointer]
 
       private
 

diff --git a/lib/rbnacl/one_time_auths/poly1305.rb b/lib/rbnacl/one_time_auths/poly1305.rb
@@ -29,11 +29,11 @@ class Poly1305 < Auth
 
       sodium_function :onetimeauth_poly1305,
                       :crypto_onetimeauth_poly1305,
-                      [:pointer, :pointer, :ulong_long, :pointer]
+                      %i[pointer pointer ulong_long pointer]
 
       sodium_function :onetimeauth_poly1305_verify,
                       :crypto_onetimeauth_poly1305_verify,
-                      [:pointer, :pointer, :ulong_long, :pointer]
+                      %i[pointer pointer ulong_long pointer]
 
       private
 

diff --git a/lib/rbnacl/password_hash/argon2.rb b/lib/rbnacl/password_hash/argon2.rb
@@ -36,19 +36,19 @@ class Argon2
       sodium_function_with_return_code(
         :pwhash,
         :crypto_pwhash_argon2i,
-        [:pointer, :ulong_long, :pointer, :ulong_long, :pointer, :ulong_long, :size_t, :int]
+        %i[pointer ulong_long pointer ulong_long pointer ulong_long size_t int]
       )
 
       sodium_function(
         :pwhash_str,
         :crypto_pwhash_argon2i_str,
-        [:pointer, :pointer, :ulong_long, :ulong_long, :size_t]
+        %i[pointer pointer ulong_long ulong_long size_t]
       )
 
       sodium_function(
         :pwhash_str_verify,
         :crypto_pwhash_argon2i_str_verify,
-        [:pointer, :pointer, :ulong_long]
+        %i[pointer pointer ulong_long]
       )
 
       ALG_DEFAULT = ALG_ARGON2I13

diff --git a/lib/rbnacl/password_hash/scrypt.rb b/lib/rbnacl/password_hash/scrypt.rb
@@ -26,7 +26,7 @@ class SCrypt
 
       sodium_function :scrypt,
                       :crypto_pwhash_scryptsalsa208sha256,
-                      [:pointer, :ulong_long, :pointer, :ulong_long, :pointer, :ulong_long, :size_t]
+                      %i[pointer ulong_long pointer ulong_long pointer ulong_long size_t]
 
       # Create a new SCrypt password hash object
       #

diff --git a/lib/rbnacl/random.rb b/lib/rbnacl/random.rb
@@ -1,8 +1,6 @@
 # encoding: binary
 # frozen_string_literal: true
 
-require "thread"
-
 module RbNaCl
   # Functions for random number generation
   #
@@ -15,7 +13,7 @@ module Random
 
     sodium_function :c_random_bytes,
                     :randombytes_buf,
-                    [:pointer, :ulong_long]
+                    %i[pointer ulong_long]
 
     # Returns a string of random bytes
     #

diff --git a/lib/rbnacl/secret_boxes/xsalsa20poly1305.rb b/lib/rbnacl/secret_boxes/xsalsa20poly1305.rb
@@ -31,11 +31,11 @@ class XSalsa20Poly1305
 
       sodium_function :secretbox_xsalsa20poly1305,
                       :crypto_secretbox_xsalsa20poly1305,
-                      [:pointer, :pointer, :ulong_long, :pointer, :pointer]
+                      %i[pointer pointer ulong_long pointer pointer]
 
       sodium_function :secretbox_xsalsa20poly1305_open,
                       :crypto_secretbox_xsalsa20poly1305_open,
-                      [:pointer, :pointer, :ulong_long, :pointer, :pointer]
+                      %i[pointer pointer ulong_long pointer pointer]
 
       # Create a new SecretBox
       #

diff --git a/lib/rbnacl/signatures/ed25519/signing_key.rb b/lib/rbnacl/signatures/ed25519/signing_key.rb
@@ -32,11 +32,11 @@ class SigningKey
 
         sodium_function  :sign_ed25519,
                          :crypto_sign_ed25519,
-                         [:pointer, :pointer, :pointer, :ulong_long, :pointer]
+                         %i[pointer pointer pointer ulong_long pointer]
 
         sodium_function  :sign_ed25519_seed_keypair,
                          :crypto_sign_ed25519_seed_keypair,
-                         [:pointer, :pointer, :pointer]
+                         %i[pointer pointer pointer]
 
         attr_reader :verify_key
 

diff --git a/lib/rbnacl/signatures/ed25519/verify_key.rb b/lib/rbnacl/signatures/ed25519/verify_key.rb
@@ -21,7 +21,7 @@ class VerifyKey
 
         sodium_function  :sign_ed25519_open,
                          :crypto_sign_ed25519_open,
-                         [:pointer, :pointer, :pointer, :ulong_long, :pointer]
+                         %i[pointer pointer pointer ulong_long pointer]
 
         # Create a new VerifyKey object from a public key.
         #

diff --git a/lib/rbnacl/sodium.rb b/lib/rbnacl/sodium.rb
@@ -36,22 +36,22 @@ def sodium_constant(constant, name = constant)
     end
 
     def sodium_function(name, function, arguments)
-      module_eval <<-eos, __FILE__, __LINE__ + 1
+      module_eval <<-RUBY, __FILE__, __LINE__ + 1
       attach_function #{function.inspect}, #{arguments.inspect}, :int
       def self.#{name}(*args)
         ret = #{function}(*args)
         ret == 0
       end
-      eos
+      RUBY
     end
 
     def sodium_function_with_return_code(name, function, arguments)
-      module_eval <<-eos, __FILE__, __LINE__ + 1
+      module_eval <<-RUBY, __FILE__, __LINE__ + 1
       attach_function #{function.inspect}, #{arguments.inspect}, :int
       def self.#{name}(*args)
         #{function}(*args)
       end
-      eos
+      RUBY
     end
   end
 end
diff --git a/lib/rbnacl/sodium/version.rb b/lib/rbnacl/sodium/version.rb
@@ -23,7 +23,7 @@ module Version
         raise "Sorry, you need to install libsodium #{MINIMUM_LIBSODIUM_VERSION}+. You have #{Version::STRING} installed"
       end
 
-      ARGON2_SUPPORTED = (INSTALLED_VERSION <=> MINIMUM_LIBSODIUM_VERSION_FOR_ARGON2) == -1 ? false : true
+      ARGON2_SUPPORTED = (INSTALLED_VERSION <=> MINIMUM_LIBSODIUM_VERSION_FOR_ARGON2) != -1
 
       # Determine if a given feature is supported based on Sodium version
       def self.supported_version?(version)