Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,7 @@

3.1.11 Mar 06 2016
- Add support for Ruby 2.2 in compiled Windows binaries

3.1.12 May 16 2018
- Add support for Ruby 2.3, 2.4, and 2.5 in compiled Windows binaries
- Fix compatibility with libxcrypt [GH #164 by @besser82]
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
bcrypt (3.1.11)
bcrypt (3.1.12)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -41,4 +41,4 @@ DEPENDENCIES
rspec (>= 3)

BUNDLED WITH
1.11.2
1.16.1
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ re-hash those passwords. This vulnerability only affected the JRuby gem.
The bcrypt gem is available on the following ruby platforms:

* JRuby
* RubyInstaller 1.8, 1.9, 2.0, 2.1, and 2.2 builds on win32
* Any 1.8, 1.9, 2.0, 2.1, 2.2, or 2.3 Ruby on a BSD/OS X/Linux system with a compiler
* RubyInstaller 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, and 2.5 builds on Windows
* Any 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, or 2.5 Ruby on a BSD/OS X/Linux system with a compiler

## How to use `bcrypt()` in your Rails application

Expand Down
4 changes: 4 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ CLEAN.include(
"lib/1.9",
"lib/2.0",
"lib/2.1",
"lib/2.2",
"lib/2.3",
"lib/2.4",
"lib/2.5",
"lib/bcrypt_ext.jar",
"lib/bcrypt_ext.so"
)
Expand Down
2 changes: 1 addition & 1 deletion bcrypt.gemspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = 'bcrypt'
s.version = '3.1.11'
s.version = '3.1.12'

s.summary = "OpenBSD's bcrypt() password hashing algorithm."
s.description = <<-EOF
Expand Down