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
28 changes: 14 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
PATH
remote: .
specs:
bcrypt-ruby (3.1.2)
bcrypt (3.1.2)

GEM
remote: https://rubygems.org/
specs:
diff-lcs (1.2.4)
json (1.7.3)
json (1.7.3-java)
diff-lcs (1.2.5)
json (1.8.1)
json (1.8.1-java)
rake (10.1.0)
rake-compiler (0.9.1)
rake-compiler (0.9.2)
rake
rdoc (3.12)
rdoc (4.0.1)
json (~> 1.4)
rspec (2.13.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
rspec-core (2.13.1)
rspec-expectations (2.13.0)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.7)
rspec-expectations (2.14.4)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.13.1)
rspec-mocks (2.14.4)

PLATFORMS
java
ruby

DEPENDENCIES
bcrypt-ruby!
bcrypt!
rake-compiler (~> 0.9.0)
rdoc
rspec
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

An easy way to keep your users' passwords secure.

* http://bcrypt-ruby.rubyforge.org/
* http://github.com/codahale/bcrypt-ruby/tree/master

[![Build Status](https://travis-ci.org/codahale/bcrypt-ruby.png?branch=master)](https://travis-ci.org/codahale/bcrypt-ruby)
Expand All @@ -18,17 +17,17 @@ security experts is not a professional response to risk.

`bcrypt()` allows you to easily harden your application against these kinds of attacks.

*Note*: JRuby versions of bcrypt-ruby `<= 2.1.3` had a [security
*Note*: JRuby versions of bcrypt `<= 2.1.3` had a [security
vulnerability](http://www.mindrot.org/files/jBCrypt/internat.adv) that
was fixed in `>= 2.1.4`. If you used a vulnerable version to hash
passwords with international characters in them, you will need to
re-hash those passwords. This vulnerability only affected the JRuby gem.

## How to install bcrypt

gem install bcrypt-ruby
gem install bcrypt

The bcrypt-ruby gem is available on the following ruby platforms:
The bcrypt gem is available on the following ruby platforms:

* JRuby
* RubyInstaller 1.8, 1.9, and 2.0 builds on win32
Expand Down
3 changes: 1 addition & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ require 'rspec/core/rake_task'
require 'rubygems/package_task'
require 'rake/extensiontask'
require 'rake/javaextensiontask'
require 'rake/contrib/rubyforgepublisher'
require 'rake/clean'
require 'rdoc/task'
require 'benchmark'
Expand All @@ -18,7 +17,7 @@ CLOBBER.include(
"doc/coverage",
"pkg"
)
GEMSPEC = eval(File.read(File.expand_path("../bcrypt-ruby.gemspec", __FILE__)))
GEMSPEC = eval(File.read(File.expand_path("../bcrypt.gemspec", __FILE__)))

task :default => [:compile, :spec]

Expand Down
5 changes: 2 additions & 3 deletions bcrypt-ruby.gemspec → bcrypt.gemspec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Gem::Specification.new do |s|
s.name = 'bcrypt-ruby'
s.name = 'bcrypt'
s.version = '3.1.2'

s.summary = "OpenBSD's bcrypt() password hashing algorithm."
Expand All @@ -24,7 +24,6 @@ Gem::Specification.new do |s|

s.authors = ["Coda Hale"]
s.email = "coda.hale@gmail.com"
s.homepage = "http://bcrypt-ruby.rubyforge.org"
s.rubyforge_project = "bcrypt-ruby"
s.homepage = "https://github.com/codahale/bcrypt-ruby"
s.license = "MIT"
end