Hello community,
here is the log from the commit of package rubygem-bcrypt_pbkdf for
openSUSE:Factory checked in at 2019-06-19 20:59:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-bcrypt_pbkdf (Old)
and /work/SRC/openSUSE:Factory/.rubygem-bcrypt_pbkdf.new.4811 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-bcrypt_pbkdf"
Wed Jun 19 20:59:16 2019 rev:2 rq:705977 version:1.0.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/rubygem-bcrypt_pbkdf/rubygem-bcrypt_pbkdf.changes
2019-01-21 10:54:17.799732814 +0100
+++
/work/SRC/openSUSE:Factory/.rubygem-bcrypt_pbkdf.new.4811/rubygem-bcrypt_pbkdf.changes
2019-06-19 20:59:18.066029497 +0200
@@ -1,0 +2,6 @@
+Sun May 5 09:19:21 UTC 2019 - Stephan Kulow <[email protected]>
+
+- updated to version 1.0.1
+ see installed CHANGELOG.md
+
+-------------------------------------------------------------------
Old:
----
bcrypt_pbkdf-1.0.0.gem
New:
----
bcrypt_pbkdf-1.0.1.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-bcrypt_pbkdf.spec ++++++
--- /var/tmp/diff_new_pack.5VymEl/_old 2019-06-19 20:59:18.658030027 +0200
+++ /var/tmp/diff_new_pack.5VymEl/_new 2019-06-19 20:59:18.658030027 +0200
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-bcrypt_pbkdf
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -24,15 +24,15 @@
#
Name: rubygem-bcrypt_pbkdf
-Version: 1.0.0
+Version: 1.0.1
Release: 0
%define mod_name bcrypt_pbkdf
%define mod_full_name %{mod_name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: ruby-macros >= 5
BuildRequires: %{rubydevel}
BuildRequires: %{rubygem gem2rpm}
BuildRequires: %{rubygem rdoc > 3.10}
+BuildRequires: ruby-macros >= 5
Url: https://github.com/net-ssh/bcrypt_pbkdf-ruby
Source: https://rubygems.org/gems/%{mod_full_name}.gem
Source1: rubygem-bcrypt_pbkdf-rpmlintrc
++++++ bcrypt_pbkdf-1.0.0.gem -> bcrypt_pbkdf-1.0.1.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md
--- old/CHANGELOG.md 2016-11-25 19:31:55.000000000 +0100
+++ new/CHANGELOG.md 2019-04-04 12:46:50.000000000 +0200
@@ -1,3 +1,3 @@
# 1.0.0.apha1
- inital version
\ No newline at end of file
+ initial version
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Gemfile.lock new/Gemfile.lock
--- old/Gemfile.lock 2016-11-25 19:31:55.000000000 +0100
+++ new/Gemfile.lock 2019-04-04 12:46:50.000000000 +0200
@@ -1,22 +1,18 @@
PATH
remote: .
specs:
- bcrypt_pbkdf (1.0.0)
+ bcrypt_pbkdf (1.0.1)
GEM
remote: https://rubygems.org/
specs:
- ffi (1.9.10)
- json (1.8.3)
+ json (1.8.6)
minitest (5.8.3)
+ openssl (2.1.2)
rake (11.1.1)
rake-compiler (0.9.7)
rake
rake-compiler-dock (0.5.3)
- rbnacl (3.3.0)
- ffi
- rbnacl-libsodium (1.0.8)
- rbnacl (~> 3.0, >= 3.0.1)
rdoc (3.12.2)
json (~> 1.4)
@@ -26,11 +22,10 @@
DEPENDENCIES
bcrypt_pbkdf!
minitest (>= 5)
+ openssl
rake-compiler (~> 0.9.7)
rake-compiler-dock (~> 0.5.3)
- rbnacl (~> 3.3)
- rbnacl-libsodium (~> 1.0.8)
rdoc (~> 3.12)
BUNDLED WITH
- 1.13.6
+ 1.17.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/README.md new/README.md
--- old/README.md 2016-11-25 19:31:55.000000000 +0100
+++ new/README.md 2019-04-04 12:46:50.000000000 +0200
@@ -13,3 +13,19 @@
http://www.tedunangst.com/flak/post/bcrypt-pbkdf
http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libutil/bcrypt_pbkdf.c?rev=1.13&content-type=text/x-cvsweb-markup
+
+# Building
+
+For windows cross build make sure you checked out the gem source under the
home directory
+
+```sh
+gem install rake-compiler-docks
+```
+
+```sh
+bundle exec rake compile
+bundle exec rake test
+bundle exec rake clean clobber
+bundle exec rake gem:windows
+bundle exec rake release
+```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Rakefile new/Rakefile
--- old/Rakefile 2016-11-25 19:31:55.000000000 +0100
+++ new/Rakefile 2019-04-04 12:46:50.000000000 +0200
@@ -1,5 +1,6 @@
require 'rake/testtask'
require 'rubygems/package_task'
+require 'bundler/gem_tasks'
require 'rake/extensiontask'
require 'rake/clean'
require 'rdoc/task'
@@ -27,7 +28,7 @@
desc "Run all tests"
Rake::TestTask.new do |t|
- #t.pattern =
+ #t.pattern =
t.test_files = FileList['test/**/*_test.rb']
t.ruby_opts = ['-w']
t.libs << "test"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bcrypt_pbkdf.gemspec new/bcrypt_pbkdf.gemspec
--- old/bcrypt_pbkdf.gemspec 2016-11-25 19:31:55.000000000 +0100
+++ new/bcrypt_pbkdf.gemspec 2019-04-04 12:46:50.000000000 +0200
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = 'bcrypt_pbkdf'
- s.version = '1.0.0'
+ s.version = '1.0.1'
s.summary = "OpenBSD's bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based
PRF)"
s.description = <<-EOF
@@ -12,8 +12,7 @@
s.add_development_dependency 'rake-compiler', '~> 0.9.7'
s.add_development_dependency 'minitest', '>= 5'
- s.add_development_dependency 'rbnacl', '~> 3.3'
- s.add_development_dependency 'rbnacl-libsodium', '~> 1.0.8'
+ s.add_development_dependency 'openssl'
s.add_development_dependency 'rdoc', '~> 3.12'
s.add_development_dependency 'rake-compiler-dock', '~> 0.5.3'
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ext/mri/includes.h new/ext/mri/includes.h
--- old/ext/mri/includes.h 2016-11-25 19:31:55.000000000 +0100
+++ new/ext/mri/includes.h 2019-04-04 12:46:50.000000000 +0200
@@ -6,7 +6,7 @@
#include <stdlib.h>
#include <strings.h>
-#if defined(_WIN32)
+#if defined(_WIN32) || (defined(__sun) && defined(__SVR4))
typedef uint8_t u_int8_t;
typedef uint16_t u_int16_t;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2016-11-25 19:31:55.000000000 +0100
+++ new/metadata 2019-04-04 12:46:50.000000000 +0200
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: bcrypt_pbkdf
version: !ruby/object:Gem::Version
- version: 1.0.0
+ version: 1.0.1
platform: ruby
authors:
- Miklos Fazekas
autorequire:
bindir: bin
cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: rake-compiler
@@ -39,33 +39,19 @@
- !ruby/object:Gem::Version
version: '5'
- !ruby/object:Gem::Dependency
- name: rbnacl
+ name: openssl
requirement: !ruby/object:Gem::Requirement
requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: '3.3'
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: '3.3'
-- !ruby/object:Gem::Dependency
- name: rbnacl-libsodium
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
+ - - ">="
- !ruby/object:Gem::Version
- version: 1.0.8
+ version: '0'
type: :development
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - - "~>"
+ - - ">="
- !ruby/object:Gem::Version
- version: 1.0.8
+ version: '0'
- !ruby/object:Gem::Dependency
name: rdoc
requirement: !ruby/object:Gem::Requirement
@@ -156,7 +142,7 @@
version: '0'
requirements: []
rubyforge_project:
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
signing_key:
specification_version: 4
summary: OpenBSD's bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based PRF)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/test/bcrypt_pnkdf/engine_test.rb
new/test/bcrypt_pnkdf/engine_test.rb
--- old/test/bcrypt_pnkdf/engine_test.rb 2016-11-25 19:31:55.000000000
+0100
+++ new/test/bcrypt_pnkdf/engine_test.rb 2019-04-04 12:46:50.000000000
+0200
@@ -1,10 +1,8 @@
require 'minitest/autorun'
require 'test_helper'
-# bcrypt_pbkdf in ruby using libsodium
-require 'rbnacl/libsodium'
-require 'rbnacl'
-require 'rbnacl/hash'
+# bcrypt_pbkdf in ruby
+require 'openssl'
BCRYPT_BLOCKS = 8
BCRYPT_HASHSIZE = BCRYPT_BLOCKS * 4
@@ -13,7 +11,7 @@
stride = (keylen + BCRYPT_HASHSIZE - 1) / BCRYPT_HASHSIZE
amt = (keylen + stride - 1) / stride
- sha2pass = RbNaCl::Hash.sha512(password)
+ sha2pass = OpenSSL::Digest::SHA512.new(password).digest
#puts "[RB] sha2pass:#{sha2pass.inspect} #{sha2pass.size}"
remlen = keylen
@@ -32,13 +30,13 @@
countsalt[saltlen + 3] = (count & 0xff).chr
#puts "[RC] countsalt: #{countsalt.inspect} len:#{countsalt.size}"
- sha2salt = RbNaCl::Hash.sha512(countsalt)
+ sha2salt = OpenSSL::Digest::SHA512.new(countsalt).digest
tmpout = BCryptPbkdf::Engine::__bc_crypt_hash(sha2pass, sha2salt)
out = tmpout.clone
#puts "[RB] out: #{out.inspect} keylen:#{remlen} count:#{count}"
(1...rounds).each do |i|
- sha2salt = RbNaCl::Hash.sha512(tmpout)
+ sha2salt = OpenSSL::Digest::SHA512.new(tmpout).digest
tmpout = BCryptPbkdf::Engine::__bc_crypt_hash(sha2pass, sha2salt)
out.bytes.each_with_index {|o,j| out.setbyte(j,o ^ tmpout[j].ord) }
end
@@ -48,7 +46,7 @@
dest = i * stride + (count -1)
key[dest] = out[i] if (dest < keylen)
end
-
+
remlen -= amt
count += 1
end
@@ -66,13 +64,13 @@
assert_equal bcrypt_pbkdf(p,s,l,r), BCryptPbkdf::key(p,s,l,r)
end
end
-
+
def table
[
- ["pass2", "salt2", 12, 2, [214, 14, 48, 162, 131, 206, 121, 176, 50,
104, 231, 252]],
+ ["pass2", "salt2", 12, 2, [214, 14, 48, 162, 131, 206, 121, 176, 50,
104, 231, 252]],
["\u0000\u0001foo", "\u0001\u0002fooo3", 14, 5, [46, 189, 32, 185, 94,
85, 232, 10, 84, 26, 44, 161, 49, 126]],
["doozoasd", "fooo$AS!", 14, 22, [57, 62, 50, 107, 70, 155, 65, 5, 129,
211, 189, 169, 188, 65]]
]
end
-end
\ No newline at end of file
+end
