rbnacl 7.0.0 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18e5a4efebf3a289cd699ebce7b08ad598411c112d15c35e72c1436ca4d93d6f
-  data.tar.gz: 0f26ed2371c60ea5a2bda37a31b0a9d501fd9813be84613b002c2d051ad9b97c
+  metadata.gz: b4d92c7a609efebd94247e98d2ede88a057b5325f6cdb0e00baa5896cd5051f6
+  data.tar.gz: 4d9e65d468bd0b813817b0e1bb63327bbf450505e6e47f818fc5921886d69110
 SHA512:
-  metadata.gz: 16de9db7bff675c9ffdede714661bcafa19fe5c9998ea8c8eb40e252297578f98eaf095c1672b98a7c08248900001917b2ccb32bc3987728ec9d32fedca4d29b
-  data.tar.gz: db529680fbb1b998520754bfee5530d7da2f732c4edfb8407df6284cb423d9816257c26e8a934a07aa8b712dd72e6d211f61d433c4e5b36ee639ecfbe4018ada
+  metadata.gz: 23a083b6a009719564e5f87b1f179f1e70b8a0233118491e88cea60e34f7f64bfbb30efe5aab94f90e691f109b2820c29adaffd0ec27e79bdf3cf7466d9ff977
+  data.tar.gz: '02915f7b4c44c3d3d12350bc23380450ee6ea51323bcbcee74b01009a307887043da71631beb12ab43b45c3299dd2a47bac847f4ba6b3e1aae33541edb9d7351'

data/.travis.yml

@@ -1,19 +1,10 @@
 language: ruby
 cache: bundler
 
-before_install:
-  - sudo add-apt-repository -y ppa:chris-lea/libsodium
-  - sudo apt-get update -q
-  - sudo apt-get install libsodium-dev
-  - gem update --system
-  - gem --version
-  - gem install bundler -v 1.17.1
-  - bundle --version
+before_install: sudo apt-get install libsodium18
 
 rvm:
-  - jruby-9.1.15.0
-  - 2.3
-  - 2.4
+  - jruby-9.2.8.0
   - 2.5
   - 2.6
 

data/CHANGES.md

@@ -1,3 +1,8 @@
+## [7.1.0] (2019-09-07)
+
+- Attached signature API ([#197], [#202])
+- Fix the `generichash` state definition ([#200])
+
 ## [7.0.0] (2019-05-23)
 
 - Drop support for Ruby 2.2 ([#194])
@@ -105,6 +110,10 @@
 
 - Initial release
 
+[7.1.0]: https://github.com/crypto-rb/rbnacl/pull/203
+[#202]: https://github.com/crypto-rb/rbnacl/pull/202
+[#200]: https://github.com/crypto-rb/rbnacl/pull/200
+[#197]: https://github.com/crypto-rb/rbnacl/pull/197
 [7.0.0]: https://github.com/crypto-rb/rbnacl/pull/195
 [#194]: https://github.com/crypto-rb/rbnacl/pull/194
 [6.0.1]: https://github.com/crypto-rb/rbnacl/pull/191

data/README.md

@@ -59,11 +59,9 @@ You can use RbNaCl on platforms libsodium is supported (see below).
 This library aims to support and is [tested against][travis] the following Ruby
 versions:
 
-* Ruby 2.3
-* Ruby 2.4
 * Ruby 2.5
 * Ruby 2.6
-* JRuby 9.1
+* JRuby 9.2
 
 If something doesn't work on one of these versions, it's a bug.
 

data/lib/rbnacl/hash/blake2b.rb

@@ -170,14 +170,9 @@ module RbNaCl
       end
 
       # The crypto_generichash_blake2b_state struct representation
-      # ref: jedisct1/libsodium/src/libsodium/include/sodium/crypto_generichash_blake2b.h#L23
+      # ref: jedisct1/libsodium/blob/c87df74c7b5969f4/src/libsodium/include/sodium/crypto_generichash_blake2b.h#L23-L25
       class State < FFI::Struct
-        layout :h, [:uint64, 8],
-               :t, [:uint64, 2],
-               :f, [:uint64, 2],
-               :buf, [:uint8, 2 * 128],
-               :buflen, :size_t,
-               :last_node, :uint8
+        layout :opaque, [:uint8, 384]
       end
     end
   end

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

@@ -73,12 +73,19 @@ module RbNaCl
         #
         # @return [String] Signature as bytes
         def sign(message)
+          sign_attached(message)[0, signature_bytes]
+        end
+
+        # Sign a message using this key, attaching the signature to the message
+        #
+        # @param message [String] Message to be signed by this key
+        #
+        # @return [String] Signature and the message as bytes
+        def sign_attached(message)
           buffer = Util.prepend_zeros(signature_bytes, message)
           buffer_len = Util.zeros(FFI::Type::LONG_LONG.size)
-
           self.class.sign_ed25519(buffer, buffer_len, message, message.bytesize, @signing_key)
-
-          buffer[0, signature_bytes]
+          buffer
         end
 
         # Return the raw seed value of this key

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

@@ -47,12 +47,26 @@ module RbNaCl
         def verify(signature, message)
           signature = signature.to_str
           Util.check_length(signature, signature_bytes, "signature")
+          verify_attached(signature + message)
+        end
+
+        # Verify a signature for a given signed message
+        #
+        # Raises if the signature is invalid.
+        #
+        # @param signed_message [String] Message combined with signature to be authenticated
+        #
+        # @raise [BadSignatureError] if the signature check fails
+        #
+        # @return [Boolean] was the signature authentic?
+        def verify_attached(signed_message)
+          raise LengthError, "Signed message can not be nil" if signed_message.nil?
+          raise LengthError, "Signed message can not be shorter than a signature" if signed_message.bytesize <= signature_bytes
 
-          sig_and_msg = signature + message
-          buffer = Util.zeros(sig_and_msg.bytesize)
+          buffer = Util.zeros(signed_message.bytesize)
           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)
+          success = self.class.sign_ed25519_open(buffer, buffer_len, signed_message, signed_message.bytesize, @key)
           raise(BadSignatureError, "signature was forged/corrupt") unless success
 
           true

data/lib/rbnacl/version.rb

@@ -4,5 +4,5 @@
 # NaCl/libsodium for Ruby
 module RbNaCl
   # The library's version
-  VERSION = "7.0.0"
+  VERSION = "7.1.0"
 end

data/rbnacl.gemspec

@@ -20,10 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-
   spec.required_ruby_version = ">= 2.3.0"
-
   spec.add_runtime_dependency "ffi"
-
   spec.add_development_dependency "bundler"
 end

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

@@ -17,6 +17,11 @@ RSpec.describe RbNaCl::SigningKey do
     expect(subject.sign(message)).to eq signature
   end
 
+  it "signs messages, full version" do
+    expect(subject.sign_attached(message)[0, RbNaCl::SigningKey.signature_bytes]).to eq signature
+    expect(subject.sign_attached(message)[RbNaCl::SigningKey.signature_bytes, message.length]).to eq message
+  end
+
   it "serializes to bytes" do
     expect(subject.to_bytes).to eq signing_key
   end

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

@@ -20,14 +20,30 @@ RSpec.describe RbNaCl::VerifyKey do
     expect(subject.verify(signature, message)).to eq true
   end
 
+  it "verifies correct signatures, full version" do
+    expect(subject.verify_attached(signature + message)).to eq true
+  end
+
   it "raises when asked to verify a bad signature" do
     expect { subject.verify(bad_signature, message) }.to raise_exception RbNaCl::BadSignatureError
   end
 
+  it "raises when asked to verify a bad signature, full version" do
+    expect { subject.verify_attached(bad_signature + message) }.to raise_exception RbNaCl::BadSignatureError
+  end
+
   it "raises when asked to verify a short signature" do
     expect { subject.verify(bad_signature[0, 63], message) }.to raise_exception RbNaCl::LengthError
   end
 
+  it "raises when asked to verify a nil signed message" do
+    expect { subject.verify_attached(nil) }.to raise_exception RbNaCl::LengthError
+  end
+
+  it "raises when asked to verify too short signed message" do
+    expect { subject.verify_attached(signature) }.to raise_exception RbNaCl::LengthError
+  end
+
   it "serializes to bytes" do
     expect(subject.to_bytes).to eq verify_key
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbnacl
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.0
 platform: ruby
 authors:
 - Tony Arcieri
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -154,8 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby binding to the libsodium/NaCl cryptography library