rbnacl 5.0.0 → 6.0.0

data/spec/shared/aead.rb

@@ -4,11 +4,11 @@
 RSpec.shared_examples "aead" do
   let(:corrupt_ciphertext) { ciphertext.succ }
   let(:trunc_ciphertext)   { ciphertext[0, 20] }
-  let(:invalid_nonce)      { nonce[0, nonce.bytesize/2] } # too short!
+  let(:invalid_nonce)      { nonce[0, nonce.bytesize / 2] } # too short!
   let(:invalid_nonce_long) { nonce + nonce } # too long!
-  let(:nonce_error_regex)  { %r{Nonce.*(Expected #{aead.nonce_bytes})} }
+  let(:nonce_error_regex)  { /Nonce.*(Expected #{aead.nonce_bytes})/ }
   let(:corrupt_ad)         { ad.succ }
-  let(:trunc_ad)           { ad[0, ad.bytesize/2] }
+  let(:trunc_ad)           { ad[0, ad.bytesize / 2] }
 
   let(:aead) { described_class.new(key) }
 
@@ -36,19 +36,27 @@ RSpec.shared_examples "aead" do
     end
 
     it "raises on a short nonce" do
-      expect { aead.encrypt(invalid_nonce, message, ad) }.to raise_error(RbNaCl::LengthError, nonce_error_regex)
+      expect do
+        aead.encrypt(invalid_nonce, message, ad)
+      end.to raise_error(RbNaCl::LengthError, nonce_error_regex)
     end
 
     it "raises on a long nonce" do
-      expect { aead.encrypt(invalid_nonce_long, message, ad) }.to raise_error(RbNaCl::LengthError, nonce_error_regex)
+      expect do
+        aead.encrypt(invalid_nonce_long, message, ad)
+      end.to raise_error(RbNaCl::LengthError, nonce_error_regex)
     end
 
     it "works with an empty message" do
-      expect { aead.encrypt(nonce, nil, ad)}.to_not raise_error
+      expect do
+        aead.encrypt(nonce, nil, ad)
+      end.to_not raise_error
     end
 
     it "works with an empty additional data" do
-      expect{ aead.encrypt(nonce, message, nil)}.to_not raise_error
+      expect do
+        aead.encrypt(nonce, message, nil)
+      end.to_not raise_error
     end
   end
 
@@ -58,27 +66,39 @@ RSpec.shared_examples "aead" do
     end
 
     it "raises on a truncated message to decrypt" do
-      expect { aead.decrypt(nonce, trunc_ciphertext, ad) }.to raise_error(RbNaCl::CryptoError, /Decryption failed. Ciphertext failed verification./)
+      expect do
+        aead.decrypt(nonce, trunc_ciphertext, ad)
+      end.to raise_error(RbNaCl::CryptoError, /Decryption failed. Ciphertext failed verification./)
     end
 
     it "raises on a corrupt ciphertext" do
-      expect { aead.decrypt(nonce, corrupt_ciphertext, ad) }.to raise_error(RbNaCl::CryptoError, /Decryption failed. Ciphertext failed verification./)
+      expect do
+        aead.decrypt(nonce, corrupt_ciphertext, ad)
+      end.to raise_error(RbNaCl::CryptoError, /Decryption failed. Ciphertext failed verification./)
     end
 
     it "raises when the additional data is truncated" do
-      expect { aead.decrypt(nonce, ciphertext, corrupt_ad) }.to raise_error(RbNaCl::CryptoError, /Decryption failed. Ciphertext failed verification./)
+      expect do
+        aead.decrypt(nonce, ciphertext, corrupt_ad)
+      end.to raise_error(RbNaCl::CryptoError, /Decryption failed. Ciphertext failed verification./)
     end
 
     it "raises when the additional data is corrupt " do
-      expect { aead.decrypt(nonce, ciphertext, trunc_ad) }.to raise_error(RbNaCl::CryptoError, /Decryption failed. Ciphertext failed verification./)
+      expect do
+        aead.decrypt(nonce, ciphertext, trunc_ad)
+      end.to raise_error(RbNaCl::CryptoError, /Decryption failed. Ciphertext failed verification./)
     end
 
     it "raises on a short nonce" do
-      expect { aead.decrypt(invalid_nonce, message, ad) }.to raise_error(RbNaCl::LengthError, nonce_error_regex)
+      expect do
+        aead.decrypt(invalid_nonce, message, ad)
+      end.to raise_error(RbNaCl::LengthError, nonce_error_regex)
     end
 
     it "raises on a long nonce" do
-      expect { aead.decrypt(invalid_nonce_long, message, ad) }.to raise_error(RbNaCl::LengthError, nonce_error_regex)
+      expect do
+        aead.decrypt(invalid_nonce_long, message, ad)
+      end.to raise_error(RbNaCl::LengthError, nonce_error_regex)
     end
   end
 end

data/spec/shared/authenticator.rb

@@ -2,9 +2,6 @@
 # frozen_string_literal: true
 
 RSpec.shared_examples "authenticator" do
-  let(:key)     { vector "auth_key_#{described_class.key_bytes}".to_sym }
-  let(:message) { vector :auth_message }
-
   context ".new" do
     it "accepts a key" do
       expect { described_class.new(key) }.to_not raise_error
@@ -17,14 +14,6 @@ RSpec.shared_examples "authenticator" do
     it "raises TypeError on a nil key" do
       expect { described_class.new(nil) }.to raise_error(TypeError)
     end
-
-    it "raises ArgumentError on a key which is too long" do
-      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" * described_class.key_bytes.pred) }.to raise_error(ArgumentError)
-    end
   end
 
   context ".auth" do
@@ -35,10 +24,6 @@ RSpec.shared_examples "authenticator" do
     it "raises TypeError on a nil key" do
       expect { described_class.auth(nil, message) }.to raise_error(TypeError)
     end
-
-    it "raises ArgumentError on a key which is too long" do
-      expect { described_class.auth("\0" * described_class.key_bytes.succ, message) }.to raise_error(ArgumentError)
-    end
   end
 
   context ".verify" do
@@ -50,10 +35,6 @@ RSpec.shared_examples "authenticator" do
       expect { described_class.verify(nil, tag, message) }.to raise_error(TypeError)
     end
 
-    it "raises ArgumentError on a key which is too long" do
-      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
       expect { described_class.verify(key, tag, message + "\0") }.to raise_error(RbNaCl::BadAuthenticatorError)
     end

data/spec/shared/box.rb

@@ -16,11 +16,15 @@ RSpec.shared_examples "box" do
     end
 
     it "raises on a short nonce" do
-      expect { box.box(invalid_nonce, message) }.to raise_error(RbNaCl::LengthError, nonce_error_regex)
+      expect do
+        box.box(invalid_nonce, message)
+      end.to raise_error(RbNaCl::LengthError, nonce_error_regex)
     end
 
     it "raises on a long nonce" do
-      expect { box.box(invalid_nonce_long, message) }.to raise_error(RbNaCl::LengthError, nonce_error_regex)
+      expect do
+        box.box(invalid_nonce_long, message)
+      end.to raise_error(RbNaCl::LengthError, nonce_error_regex)
     end
   end
 
@@ -30,19 +34,27 @@ RSpec.shared_examples "box" do
     end
 
     it "raises on a truncated message to decrypt" do
-      expect { box.open(nonce, ciphertext[0, 64]) }.to raise_error(RbNaCl::CryptoError, /Decryption failed. Ciphertext failed verification./)
+      expect do
+        box.open(nonce, ciphertext[0, 64])
+      end.to raise_error(RbNaCl::CryptoError, /Decryption failed. Ciphertext failed verification./)
     end
 
     it "raises on a corrupt ciphertext" do
-      expect { box.open(nonce, corrupt_ciphertext) }.to raise_error(RbNaCl::CryptoError, /Decryption failed. Ciphertext failed verification./)
+      expect do
+        box.open(nonce, corrupt_ciphertext)
+      end.to raise_error(RbNaCl::CryptoError, /Decryption failed. Ciphertext failed verification./)
     end
 
     it "raises on a short nonce" do
-      expect { box.open(invalid_nonce, message) }.to raise_error(RbNaCl::LengthError, nonce_error_regex)
+      expect do
+        box.open(invalid_nonce, message)
+      end.to raise_error(RbNaCl::LengthError, nonce_error_regex)
     end
 
     it "raises on a long nonce" do
-      expect { box.open(invalid_nonce_long, message) }.to raise_error(RbNaCl::LengthError, nonce_error_regex)
+      expect do
+        box.open(invalid_nonce_long, message)
+      end.to raise_error(RbNaCl::LengthError, nonce_error_regex)
     end
   end
 end

data/spec/shared/hmac.rb

@@ -0,0 +1,46 @@
+# encoding: binary
+# frozen_string_literal: true
+
+RSpec.shared_examples "HMAC" do
+  context ".new" do
+    it "raises EncodingError on a key with wrong encoding" do
+      expect { described_class.new(wrong_key) }.to raise_error(EncodingError)
+    end
+  end
+
+  context ".auth" do
+    it "raises EncodingError on a key with wrong encoding " do
+      expect { described_class.auth(wrong_key, message) }.to raise_error(EncodingError)
+    end
+  end
+
+  context ".verify" do
+    it "raises EncodingError on a key with wrong encoding" do
+      expect { described_class.verify(wrong_key, tag, message) }.to raise_error(EncodingError)
+    end
+  end
+
+  context "Instance methods" do
+    let(:authenticator) { described_class.new(key) }
+
+    before(:each) { authenticator.update(message) }
+
+    context "#update" do
+      it "returns hexdigest when produces an authenticator" do
+        expect(authenticator.update(message)).to eq mult_tag.unpack("H*").first
+      end
+    end
+
+    context "#digest" do
+      it "returns an authenticator" do
+        expect(authenticator.digest).to eq tag
+      end
+    end
+
+    context "#hexdigest" do
+      it "returns hex authenticator" do
+        expect(authenticator.hexdigest).to eq tag.unpack("H*").first
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -9,12 +9,14 @@ Coveralls.wear!
 $RBNACL_SELF_TEST = false
 
 require "bundler/setup"
-require "rbnacl/libsodium"
+require "rbnacl"
+
 require "shared/box"
 require "shared/authenticator"
 require "shared/key_equality"
 require "shared/serializable"
 require "shared/aead"
+require "shared/hmac"
 
 def vector(name)
   [RbNaCl::TEST_VECTORS[name]].pack("H*")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbnacl
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Tony Arcieri
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: The Networking and Cryptography (NaCl) library provides a high-level
@@ -48,13 +48,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .ruby-version
-- .travis.yml
-- .yardopts
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
+- ".yardopts"
 - CHANGES.md
 - Gemfile
 - Guardfile
@@ -69,6 +68,7 @@ files:
 - lib/rbnacl/aead/base.rb
 - lib/rbnacl/aead/chacha20poly1305_ietf.rb
 - lib/rbnacl/aead/chacha20poly1305_legacy.rb
+- lib/rbnacl/aead/xchacha20poly1305_ietf.rb
 - lib/rbnacl/auth.rb
 - lib/rbnacl/boxes/curve25519xsalsa20poly1305.rb
 - lib/rbnacl/boxes/curve25519xsalsa20poly1305/private_key.rb
@@ -103,6 +103,7 @@ files:
 - rbnacl.gemspec
 - spec/rbnacl/aead/chacha20poly1305_ietf_spec.rb
 - spec/rbnacl/aead/chacha20poly1305_legacy_spec.rb
+- spec/rbnacl/aead/xchacha20poly1305_ietf_spec.rb
 - spec/rbnacl/authenticators/poly1305_spec.rb
 - spec/rbnacl/boxes/curve25519xsalsa20poly1305/private_key_spec.rb
 - spec/rbnacl/boxes/curve25519xsalsa20poly1305/public_key_spec.rb
@@ -124,12 +125,13 @@ files:
 - spec/shared/aead.rb
 - spec/shared/authenticator.rb
 - spec/shared/box.rb
+- spec/shared/hmac.rb
 - spec/shared/key_equality.rb
 - spec/shared/serializable.rb
 - spec/spec_helper.rb
 - tasks/rspec.rake
 - tasks/rubocop.rake
-homepage: https://github.com/cryptosphere/rbnacl
+homepage: https://github.com/crypto-rb/rbnacl
 licenses:
 - MIT
 metadata: {}
@@ -139,23 +141,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.2.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
-summary: Ruby binding to the Networking and Cryptography (NaCl) library
+summary: Ruby binding to the libsodium/NaCl cryptography library
 test_files:
 - spec/rbnacl/aead/chacha20poly1305_ietf_spec.rb
 - spec/rbnacl/aead/chacha20poly1305_legacy_spec.rb
+- spec/rbnacl/aead/xchacha20poly1305_ietf_spec.rb
 - spec/rbnacl/authenticators/poly1305_spec.rb
 - spec/rbnacl/boxes/curve25519xsalsa20poly1305/private_key_spec.rb
 - spec/rbnacl/boxes/curve25519xsalsa20poly1305/public_key_spec.rb
@@ -177,6 +180,7 @@ test_files:
 - spec/shared/aead.rb
 - spec/shared/authenticator.rb
 - spec/shared/box.rb
+- spec/shared/hmac.rb
 - spec/shared/key_equality.rb
 - spec/shared/serializable.rb
 - spec/spec_helper.rb

data/.ruby-version

@@ -1 +0,0 @@
-2.4.0