scrypt 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 955aa0f2fa4a2231c541f953d4a2da9180dae7e5
-  data.tar.gz: 792446e6d237a83c2f34883ecb190168bcbf5878
+SHA256:
+  metadata.gz: 27fb084e997c8f5ef6c5eabc8c9823c62b9beb54be2297818ca70c47137b6b12
+  data.tar.gz: d37621255d1c455593543773f887ac00b12d8040664d886ed5838a5435c0b1c0
 SHA512:
-  metadata.gz: 45d51dd3a6a46ba4bd24c3fc6fdb1f096c56206be660c2eed4c8ffa5e7f1b2e4f4a880f53c2b28a8fed60702965962e42f16235d926ca5d80d8ec49cbfa04fd8
-  data.tar.gz: 06d532fb705850b5744c32eb51e13f68794ebb3d7a1f81d516194a4b0bab9183de254285da0786bd02e528b2eeaf4ffaa180e4af8e48f5340f01d5a05fbdb760
+  metadata.gz: 706b757097bbca08633e852dce8ac3e1e90f8eb1d82e4833ad9f2beefa9e50b3ccc304357b7a55d7cbfe8cfcaca31605bfbf4f28c68661f59e17f978073134be
+  data.tar.gz: 08de38a6a613855792aafc026df7320e67e2512b76f71231b2a5d46fb56e27c9d99d194435d23507e9d5ea4d3105840cbc7a619746fb523587b7a455bf4cd94d

data/Rakefile

@@ -9,6 +9,9 @@ require 'rspec/core/rake_task'
 require 'ffi'
 require 'ffi-compiler/compile_task'
 
+require 'digest/sha2'
+require './lib/scrypt/version'
+
 require 'rubygems'
 require 'rubygems/package_task'
 
@@ -16,25 +19,41 @@ require 'rdoc/task'
 
 task :default => [:clean, :compile_ffi, :spec]
 
-desc "clean, make and run specs"
-task :spec  do
+desc 'clean, make and run specs'
+task :spec do
   RSpec::Core::RakeTask.new
 end
 
-desc "FFI compiler"
-namespace "ffi-compiler" do
+desc 'generate checksum'
+task :checksum do
+  built_gem_path = "pkg/scrypt-#{SCrypt::VERSION}.gem"
+  checksum = Digest::SHA512.new.hexdigest(File.read(built_gem_path))
+  checksum_path = "checksum/scrypt-#{SCrypt::VERSION}.gem.sha512"
+  File.open(checksum_path, 'w' ) {|f| f.write(checksum) }
+end
+
+desc 'FFI compiler'
+namespace 'ffi-compiler' do
   FFI::Compiler::CompileTask.new('ext/scrypt/scrypt_ext') do |t|
-    t.cflags << "-Wall -std=c99"
-    t.cflags << "-msse -msse2" if t.platform.arch.include? "86"
-    t.cflags << "-D_GNU_SOURCE=1" if RbConfig::CONFIG["host_os"].downcase =~ /mingw/
-    t.cflags << "-D_POSIX_C_SOURCE=199309L" if RbConfig::CONFIG['host_os'].downcase =~ /linux/
-    t.cflags << "-arch x86_64 -arch i386" if t.platform.mac?
-    t.ldflags << "-arch x86_64 -arch i386" if t.platform.mac?
+    target_cpu = RbConfig::CONFIG['target_cpu']
+
+    t.cflags << '-Wall -std=c99'
+    t.cflags << '-msse -msse2' if t.platform.arch.include? '86'
+    t.cflags << '-D_GNU_SOURCE=1' if RbConfig::CONFIG['host_os'].downcase =~ /mingw/
+    t.cflags << '-D_POSIX_C_SOURCE=199309L' if RbConfig::CONFIG['host_os'].downcase =~ /linux/
+
+    if 1.size == 4 && target_cpu =~ /i386|x86_32/ && t.platform.mac?
+      t.cflags << '-arch i386'
+      t.ldflags << '-arch i386'
+    elsif 1.size == 8 && target_cpu =~ /i686|x86_64/ && t.platform.mac?
+      t.cflags << '-arch x86_64'
+      t.ldflags << '-arch x86_64'
+    end
 
     t.add_define 'WINDOWS_OS' if FFI::Platform.windows?
   end
 end
-task :compile_ffi => ["ffi-compiler:default"]
+task :compile_ffi => ['ffi-compiler:default']
 
 CLEAN.include('ext/scrypt/*{.o,.log,.so,.bundle}')
 CLEAN.include('lib/**/*{.o,.log,.so,.bundle}')
@@ -47,10 +66,9 @@ rd = Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('COPYING', 'lib/**/*.rb')
 end
 
-
-desc "Run all specs"
-RSpec::Core::RakeTask.new do |t|
-  rspec_opts = ['--colour','--backtrace']
+desc 'Run all specs'
+RSpec::Core::RakeTask.new do |_t|
+  rspec_opts = ['--colour', '--backtrace']
 end
 
 def gem_spec
@@ -62,3 +80,4 @@ Gem::PackageTask.new(gem_spec) do |pkg|
   pkg.need_tar = true
   pkg.package_dir = 'pkg'
 end
+

data/ext/scrypt/Rakefile

@@ -1,12 +1,21 @@
 require 'ffi-compiler/compile_task'
 
+target_cpu = RbConfig::CONFIG['target_cpu']
+
 FFI::Compiler::CompileTask.new('scrypt_ext') do |t|
-  t.cflags << "-Wall -std=c99"
-  t.cflags << "-msse -msse2" if t.platform.arch.include? "86"
-  t.cflags << "-D_GNU_SOURCE=1" if RbConfig::CONFIG["host_os"].downcase =~ /mingw/
-  t.cflags << "-D_POSIX_C_SOURCE=199309L" if RbConfig::CONFIG['host_os'].downcase =~ /linux/
-  t.cflags << "-arch x86_64 -arch i386" if t.platform.mac?
-  t.ldflags << "-arch x86_64 -arch i386" if t.platform.mac?
+  t.cflags << '-Wall -std=c99'
+  t.cflags << '-msse -msse2' if t.platform.arch.include? '86'
+  t.cflags << '-D_GNU_SOURCE=1' if RbConfig::CONFIG['host_os'].downcase =~ /mingw/
+  t.cflags << '-D_POSIX_C_SOURCE=199309L' if RbConfig::CONFIG['host_os'].downcase =~ /linux/
+
+  if 1.size == 4 && target_cpu =~ /i386|x86_32/ && t.platform.mac?
+    t.cflags << '-arch i386'
+    t.ldflags << '-arch i386'
+  elsif 1.size == 8 && target_cpu =~ /i686|x86_64/ && t.platform.mac?
+    t.cflags << '-arch x86_64'
+    t.ldflags << '-arch x86_64'
+  end
+
   t.export '../../lib/scrypt/scrypt_ext.rb'
 
   t.add_define 'WINDOWS_OS' if FFI::Platform.windows?

data/lib/scrypt/version.rb

@@ -1,3 +1,3 @@
 module SCrypt
-  VERSION = "3.0.5"
+  VERSION = "3.0.6"
 end

data/scrypt.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Patrick Hogan", "Stephen von Takach", "Rene van Paassen" ]
   s.email       = ["pbhogan@gmail.com", "steve@advancedcontrol.com.au",
                    "rene.vanpaassen@gmail.com" ]
-  s.cert_chain  = ['certs/stakach.pem']
-  s.license     = 'MIT'
+  s.cert_chain  = ['certs/pbhogan.pem']
+  s.license     = 'BSD-3-Clause'
   s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
   s.homepage    = "https://github.com/pbhogan/scrypt"
   s.summary     = "scrypt password hashing algorithm."
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   EOF
 
   s.add_dependency 'ffi-compiler', '>= 1.0', '< 2.0'
-  s.add_development_dependency 'rake', '>= 9', '< 12'
+  s.add_development_dependency 'rake', '>= 9', '< 13'
   s.add_development_dependency 'rspec', '>= 3', '< 4'
   s.add_development_dependency 'rdoc', '>= 4', '< 5'
   s.add_development_dependency 'awesome_print', '>= 1', '< 2'
@@ -34,3 +34,4 @@ Gem::Specification.new do |s|
   s.test_files = Dir.glob("spec/**/*")
   s.require_paths = ["lib"]
 end
+

data/spec/scrypt/password_spec.rb

@@ -132,8 +132,8 @@ describe "Old-style hashes" do
 end
 
 describe "Respecting standard ruby behaviors" do
-  it 'should hash as a fixnum' do
+  it 'should hash as an integer' do
     password = SCrypt::Password.create('')
-    expect(password.hash).to be_kind_of(Fixnum)
+    expect(password.hash).to be_kind_of(Integer)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scrypt
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Patrick Hogan
@@ -12,28 +12,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  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
+  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
   -----END CERTIFICATE-----
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2018-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-compiler
@@ -64,7 +68,7 @@ dependencies:
         version: '9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +78,7 @@ dependencies:
         version: '9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -188,7 +192,7 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/pbhogan/scrypt
 licenses:
-- MIT
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -206,12 +210,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: scrypt
-rubygems_version: 2.6.10
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: scrypt password hashing algorithm.
 test_files:
-- spec/scrypt/engine_spec.rb
+- spec/spec_helper.rb
 - spec/scrypt/password_spec.rb
+- spec/scrypt/engine_spec.rb
 - spec/scrypt/utils_spec.rb
-- spec/spec_helper.rb