rbnacl-libsodium 1.0.15.1 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83d600396fb9e671bdb984562258d9afac860ef5
-  data.tar.gz: c95ce5dc460b745e6b91a6eff7247ff35f252053
+  metadata.gz: f217630436d9f2692c0050a272207ebb65cf7b43
+  data.tar.gz: 44b22ecd52844856221ed92026ac9c2cce20af50
 SHA512:
-  metadata.gz: 9729c0befc501d5e5ea7b75467da93b225a8024c3f761cf7125f5f3ff16a5fe1c3738c1b725cc9d2f3b14e5fcc87e738ef0e31bdef7f555f7bb0ec9b3543a435
-  data.tar.gz: 59d775e61f456c036c128c480687b82658c40a9abceb177b9b69ad29a0f530afd472dd8ebc17cc02b538824514573b31bb00a7cd9fc67e2ac750fa032db6190c
+  metadata.gz: bdcd2ae8318bca194425b3bcdafc951a953ccb45bac817cc59f7fe64837e7b89d8dde19fe6b62e16d12ec605b60d619828569e120242b505a082cd19cbb39ea3
+  data.tar.gz: b426e333c16054bf9e0087fdb21d83f966a86f17ece44e2066195006a390d4d6a5bb1f26a297bfc6b75c109354922267e88ab4220a3b37ef6f87c8ddd496c632

data/.travis.yml

@@ -2,13 +2,11 @@ language: ruby
 sudo: false
 
 rvm:
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
   - ruby-head
-  - jruby
-  - jruby-9.0.4.0
+  - jruby-9.1.14.0
   - jruby-head
   - rbx-2
 

data/CHANGES.md

@@ -1,86 +1,94 @@
-1.0.15.1 (2017-11-08)
----------------------
+# 1.0.16 (2017-12-13)
+
+* Update to libsodium 1.0.16
+* Add `rake gem:windows` to cross-compile Windows binary releases
+* Windows DLL path fixups
+* Support for 64-bit library pathnames
+* Drop suppoort for Ruby <2.2 (to match RbNaCl itself)
+
+# 1.0.15.1 (2017-11-08)
+
 * Run autogen.sh prior to release. D'oh!
 
-1.0.15 (2017-11-08)
--------------------
+# 1.0.15 (2017-11-08)
+
 * Update to libsodium 1.0.15
 * OpenBSD support
 
-1.0.13 (2017-08-15)
--------------------
+# 1.0.13 (2017-08-15)
+
 * Update to libsodium 1.0.13
 
-1.0.11 (2016-11-27)
--------------------
+# 1.0.11 (2016-11-27)
+
 * Update to libsodium 1.0.11
 
-1.0.10 (2016-04-16)
--------------------
+# 1.0.10 (2016-04-16)
+
 * Update to libsodium 1.0.10
 * Windows support fixups, take 2 (hopefully actually working)
 
-1.0.9 (2016-04-02)
-------------------
+# 1.0.9 (2016-04-02)
+
 * Update to libsodium 1.0.9
 * Windows support fixups
 
-1.0.8 (2015-12-26)
-------------------
+# 1.0.8 (2015-12-26)
+
 * Update to libsodium 1.0.8
 
-1.0.7 (2015-12-08)
-------------------
+# 1.0.7 (2015-12-08)
+
 * Update to libsodium 1.0.7
 
-1.0.6 (2015-11-01)
-------------------
+# 1.0.6 (2015-11-01)
+
 * Update to libsodium 1.0.6
 
-1.0.5 (2015-11-01)
-------------------
+# 1.0.5 (2015-11-01)
+
 * Update to libsodium 1.0.5
 
-1.0.4 (2015-10-18)
-------------------
+# 1.0.4 (2015-10-18)
+
 * Update to libsodium 1.0.4
 
-1.0.3 (2015-05-10)
-------------------
+# 1.0.3 (2015-05-10)
+
 * Update to libsodium 1.0.3
 
-1.0.2 (2015-01-31)
-------------------
+# 1.0.2 (2015-01-31)
+
 * Update to libsodium 1.0.2
 
-1.0.1 (2014-11-25)
-------------------
+# 1.0.1 (2014-11-25)
+
 * Update to libsodium 1.0.1
 
-1.0.0 (2014-09-27)
-------------------
+# 1.0.0 (2014-09-27)
+
 * Update to libsodium 1.0.0
 
-0.7.0 (2014-08-24)
-------------------
+# 0.7.0 (2014-08-24)
+
 * Update to libsodium 0.7.0
 
-0.6.1 (2014-07-19)
-------------------
+# 0.6.1 (2014-07-19)
+
 * Update to libsodium 0.6.1
 
-0.6.0 (2014-07-03)
-------------------
+# 0.6.0 (2014-07-03)
+
 * Update to libsodium 0.6.0
 
-0.5.0.1 (2014-06-14)
---------------------
+# 0.5.0.1 (2014-06-14)
+
 * Run autogen.sh in advance so systems without autotools still work
 
-0.5.0 (2014-05-14)
-------------------
+# 0.5.0 (2014-05-14)
+
 * Update to libsodium 0.5.0
 
-0.4.5 (2014-05-13)
-------------------
+# 0.4.5 (2014-05-13)
+
 * Initial release with libsodium 0.4.5

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem "rbnacl", github: 'cryptosphere/rbnacl'
+gem "rbnacl", git: 'https://github.com/cryptosphere/rbnacl.git'
 
 group :development, :test do
   gem "rspec", "~> 3"

data/README.md

@@ -1,6 +1,8 @@
 RbNaCl::Libsodium
 =================
-[![Gem Version](https://badge.fury.io/rb/rbnacl-libsodium.png)](http://badge.fury.io/rb/rbnacl-libsodium)
+[![Gem Version](https://badge.fury.io/rb/rbnacl-libsodium.svg)](http://badge.fury.io/rb/rbnacl-libsodium)
+[![Build Status](https://travis-ci.org/cryptosphere/rbnacl-libsodium.svg?branch=master)](https://travis-ci.org/cryptosphere/rbnacl-libsodium)
+[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/cryptosphere/rbnacl-libsodium/blob/master/LICENSE.txt)
 
 [RbNaCl] is a Ruby wrapper for [libsodium], a portable version of the Networking and
 Cryptography library ([NaCl]) created by Daniel J. Bernstein.

data/Rakefile

@@ -1,6 +1,52 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require 'rake/extensiontask'
 
 RSpec::Core::RakeTask.new
 
 task default: :spec
+
+MAKE = ENV['MAKE'] || ENV['make'] || "make"
+RUBY_CC_VERSION = ENV['RUBY_CC_VERSION'] || '2.3.0'
+
+desc "Build Windows binary packages"
+task 'gem:windows' do
+  require 'rake_compiler_dock'
+  if File.exist? "vendor/libsodium/Makefile"
+    RakeCompilerDock.sh "cd vendor/libsodium && #{MAKE} clean"
+  end
+  sh "bundle package"   # Avoid repeated downloads of gems by using gem files from the host.
+  RakeCompilerDock.sh "bundle --local && RUBY_CC_VERSION=#{RUBY_CC_VERSION} rake cross native gem"
+end
+
+spec = Gem::Specification.load("rbnacl-libsodium.gemspec")
+
+PLATFORMS = ['x86-mingw32', 'x64-mingw32']
+Rake::ExtensionTask.new("fake_ext", spec) do |ext|
+  ext.ext_dir = 'ext/rbnacl'
+  ext.cross_compile = true
+  ext.cross_platform = PLATFORMS
+  ext.cross_config_options << {
+    'x86-mingw32' => '--with-host=i686-w64-mingw32',
+    'x64-mingw32' => '--with-host=x86_64-w64-mingw32'
+  }
+  ext.cross_compiling do |gem_spec|
+    gem_spec.files.reject! { |f| /lib\/fake_ext\.so\Z/ =~ f }
+    stage_path = "#{ext.tmp_dir}/#{gem_spec.platform}/stage"
+    gem_spec.files += Dir["#{stage_path}/vendor/libsodium/dist/**/*"].map do |stage|
+      gem_path = stage.sub(stage_path + "/", "")
+      # define empty task to skip copy from vendor/libsodium/dist/*
+      task stage
+      task gem_path
+      gem_path
+    end
+    gem_spec.post_install_message = "You installed the binary version of this gem!"
+  end
+end
+
+PLATFORMS.each do |platf|
+  copy_task = "copy:fake_ext:#{platf}:#{RUBY_CC_VERSION}"
+  if Rake::Task.task_defined?(copy_task)
+    Rake::Task[copy_task].clear_actions
+  end
+end

data/ext/rbnacl/extconf.rb

@@ -1,3 +1,5 @@
+require 'mkmf'
+
 def sys(cmd)
   puts " -- #{cmd}"
   unless ret = system(cmd)
@@ -14,13 +16,26 @@ clean:
 \t@echo "Nothing to do"
 MAKEFILE
 
+HOST = arg_config("--host")
+OPTIONS = []
+if HOST
+  OPTIONS << "--host=#{HOST}"
+end
+
 CWD = File.expand_path(File.dirname(__FILE__))
 LIBSODIUM_DIR = File.expand_path(File.join(CWD, '..', '..', 'vendor', 'libsodium'))
 MAKE = ENV['MAKE'] || ENV['make'] || "make"
+if HOST
+  # install to the stage directory for rake-compiler
+  DIST = File.expand_path(File.join(CWD, '..', '..', 'tmp', RUBY_PLATFORM, 'stage', 'vendor', 'libsodium', 'dist'))
+else
+  DIST = "#{LIBSODIUM_DIR}/dist"
+end
 
 Dir.chdir(LIBSODIUM_DIR) do
   # sh is required to run configure on Windows
-  sys("sh -c \"./configure --prefix=#{LIBSODIUM_DIR}/dist\"")
+  sys("sh -c \"./configure --prefix=#{DIST} #{OPTIONS.join(' ')}\"")
+  sys("#{MAKE} clean") if HOST
   sys(MAKE)
   sys("#{MAKE} install")
 end

data/lib/rbnacl/libsodium.rb

@@ -1,18 +1,26 @@
-require "rbnacl/libsodium/version"
+require 'rbnacl/libsodium/version'
 
 module RbNaCl
   module Libsodium
-    sodiumlib_dir = File.expand_path("../../../vendor/libsodium/dist/lib/", __FILE__)
+    class << self
+      def sodiumlib_dir
+        sodiumlib32_dir = File.expand_path('../../../vendor/libsodium/dist/lib/', __FILE__)
+        sodiumlib64_dir = File.expand_path('../../../vendor/libsodium/dist/lib64/', __FILE__)
+        [sodiumlib32_dir, sodiumlib64_dir].select { |dir| Dir.exist?(dir) }.first
+      end
 
-    sodiumlib_glob = case RUBY_DESCRIPTION
-    when /darwin/ then "libsodium*.dylib"
-    when /Windows|(win|mingw)32/ then "libsodium*.dll"
-    when /openbsd/ then "libsodium*.so.*"
-    else "libsodium*.so"
+      def sodiumlib_glob
+        case RUBY_DESCRIPTION
+        when /darwin/ then 'libsodium*.dylib'
+        when /Windows|(win|mingw)32/ then '../bin/libsodium*.dll'
+        when /openbsd/ then 'libsodium*.so.*'
+        else 'libsodium*.so'
+        end
+      end
     end
 
     ::RBNACL_LIBSODIUM_GEM_LIB_PATH = Dir.glob(File.join(sodiumlib_dir, sodiumlib_glob)).first
   end
 end
 
-require "rbnacl"
+require 'rbnacl'

data/lib/rbnacl/libsodium/version.rb

@@ -1,5 +1,5 @@
 module RbNaCl
   module Libsodium
-    VERSION = '1.0.15.1'
+    VERSION = '1.0.16'
   end
 end

data/rbnacl-libsodium.gemspec

@@ -20,7 +20,10 @@ Gem::Specification.new do |spec|
   spec.extensions    = ['ext/rbnacl/extconf.rb']
 
   spec.add_runtime_dependency "rbnacl", ">= 3.0.1"
+  spec.required_ruby_version = '>= 2.2.6'
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", ">= 10"
+  spec.add_development_dependency 'rake-compiler', '~> 0.9.7'
+  spec.add_development_dependency 'rake-compiler-dock', '~> 0.5.2'
 end

data/vendor/libsodium/AUTHORS

@@ -14,6 +14,7 @@ blake2                                 Jean-Philippe Aumasson
 chacha20                               Daniel J. Bernstein
 
 chacha20poly1305                       Adam Langley
+                                       Yoav Nir
 
 curve25519                             Daniel J. Bernstein
 
@@ -41,7 +42,9 @@ crypto_aead/aes256gcm/aesni            Romain Dolbeau
                                        Frank Denis
 
 crypto_aead/chacha20poly1305           Frank Denis
-crypto_aead/xchacha20poly1305
+
+crypto_aead/xchacha20poly1305          Frank Denis
+                                       Jason A. Donenfeld
 
 crypto_auth/hmacsha256                 Colin Percival
 crypto_auth/hmacsha512
@@ -51,7 +54,8 @@ crypto_box/curve25519xsalsa20poly1305  Daniel J. Bernstein
 
 crypto_box/curve25519xchacha20poly1305 Frank Denis
 
-crypto_core/curve25519                 Daniel J. Bernstein
+crypto_core/ed25519                    Daniel J. Bernstein
+                                       Adam Langley
 
 crypto_core/hchacha20                  Frank Denis
 
@@ -67,7 +71,7 @@ crypto_hash/sha256                     Colin Percival
 crypto_hash/sha512
 crypto_hash/sha512256
 
-crypto_kdf/blake2b                     Frank Denis
+crypto_kdf                             Frank Denis
 
 crypto_kx                              Frank Denis
 
@@ -85,10 +89,10 @@ crypto_pwhash/scryptsalsa208sha256     Colin Percival
 
 crypto_scalarmult/curve25519/ref10     Daniel J. Bernstein
 
-crypto_scalarmult/curve25519/donna_c64 Adam Langley
-
 crypto_scalarmult/curve25519/sandy2x   Tung Chou
 
+crypto_scalarmult/ed25519              Frank Denis
+
 crypto_secretbox/xsalsa20poly1305      Daniel J. Bernstein
 
 crypto_secretbox/xchacha20poly1305     Frank Denis
@@ -110,6 +114,7 @@ crypto_stream/chacha20/dolbeau         Romain Dolbeau
                                        Daniel J. Bernstein
 
 crypto_stream/salsa20/ref              Daniel J. Bernstein
+crypto_stream/salsa20/xmm6
 
 crypto_stream/salsa20/xmm6int          Romain Dolbeau
                                        Daniel J. Bernstein
@@ -118,3 +123,13 @@ crypto_stream/salsa2012/ref            Daniel J. Bernstein
 crypto_stream/salsa2008/ref
 
 crypto_stream/xchacha20                Frank Denis
+
+crypto_verify                          Frank Denis
+
+sodium/codecs.c                        Frank Denis
+                                       Thomas Pornin
+                                       Christian Winnerlein
+
+sodium/core.c                          Frank Denis
+sodium/runtime.h
+sodium/utils.c

data/vendor/libsodium/ChangeLog

@@ -1,4 +1,29 @@
 
+* Version 1.0.16
+ - Signatures computations and verifications are now way faster on
+64-bit platforms with compilers supporting 128-bit arithmetic (gcc,
+clang, icc). This includes the WebAssembly target.
+ - New low-level APIs for computations over edwards25519:
+`crypto_scalarmult_ed25519()`, `crypto_scalarmult_ed25519_base()`,
+`crypto_core_ed25519_is_valid_point()`, `crypto_core_ed25519_add()`,
+`crypto_core_ed25519_sub()` and `crypto_core_ed25519_from_uniform()`
+(elligator representative to point).
+ - `crypto_sign_open()`, `crypto_sign_verify_detached() and
+`crypto_sign_edwards25519sha512batch_open` now reject public keys in
+non-canonical form in addition to low-order points.
+ - The library can be built with `ED25519_NONDETERMINISTIC` defined in
+order to use synthetic nonces for EdDSA. This is disabled by default.
+ - Webassembly: `crypto_pwhash_*()` functions are now included in
+non-sumo builds.
+ - `sodium_stackzero()` was added to wipe content off the stack.
+ - Android: support new SDKs where unified headers have become the
+default.
+ - The Salsa20-based PRNG example is now thread-safe on platforms with
+support for thread-local storage, optionally mixes bits from RDRAND.
+ - CMAKE: static library detection on Unix systems has been improved
+(thanks to @BurningEnlightenment, @nibua-r, @mellery451)
+ - Argon2 and scrypt are slightly faster on Linux.
+
 * Version 1.0.15
  - The default password hashing algorithm is now Argon2id. The
 `pwhash_str_verify()` function can still verify Argon2i hashes

data/vendor/libsodium/Makefile.in

@@ -95,7 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_catchable_abrt.m4 \
 	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_check_define.m4 \
 	$(top_srcdir)/m4/ax_check_link_flag.m4 \
-	$(top_srcdir)/m4/ax_pthread.m4 \
+	$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_tls.m4 \
 	$(top_srcdir)/m4/ax_valgrind_check.m4 \
 	$(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -251,6 +251,7 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
@@ -271,6 +272,7 @@ CFLAGS_AVX2 = @CFLAGS_AVX2@
 CFLAGS_AVX512F = @CFLAGS_AVX512F@
 CFLAGS_MMX = @CFLAGS_MMX@
 CFLAGS_PCLMUL = @CFLAGS_PCLMUL@
+CFLAGS_RDRAND = @CFLAGS_RDRAND@
 CFLAGS_SSE2 = @CFLAGS_SSE2@
 CFLAGS_SSE3 = @CFLAGS_SSE3@
 CFLAGS_SSE41 = @CFLAGS_SSE41@