bcrypt-ruby 2.0.5 → 2.1.0

data/spec/bcrypt/password_spec.rb

@@ -1,8 +1,8 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
 
 context "Creating a hashed password" do
   
-  setup do
+  before :each do
     @secret = "wheedle"
     @password = BCrypt::Password.create(@secret, :cost => 4)
   end
@@ -29,7 +29,7 @@ context "Creating a hashed password" do
 end
 
 context "Reading a hashed password" do
-  setup do
+  before :each do
     @secret = "U*U"
     @hash = "$2a$05$CCCCCCCCCCCCCCCCCCCCC.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW"
   end
@@ -48,7 +48,7 @@ context "Reading a hashed password" do
 end
 
 context "Comparing a hashed password with a secret" do
-  setup do
+  before :each do
     @secret = "U*U"
     @hash = "$2a$05$CCCCCCCCCCCCCCCCCCCCC.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW"
     @password = BCrypt::Password.create(@secret)

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 require "rubygems"
 require "spec"
 require "bcrypt"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bcrypt-ruby
 version: !ruby/object:Gem::Version 
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors: 
 - Coda Hale
@@ -9,16 +9,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-11 00:00:00 -07:00
+date: 2009-08-13 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: bcrypt() is a sophisticated and secure hash algorithm designed by The OpenBSD project for hashing passwords. bcrypt-ruby provides a simple, humane wrapper for safely handling passwords.
+description: "    bcrypt() is a sophisticated and secure hash algorithm designed by The OpenBSD project\n    for hashing passwords. bcrypt-ruby provides a simple, humane wrapper for safely handling\n    passwords.\n"
 email: coda.hale@gmail.com
 executables: []
 
 extensions: 
-- ext/extconf.rb
+- ext/mri/extconf.rb
 extra_rdoc_files: 
 - README
 - COPYING
@@ -33,13 +33,18 @@ files:
 - spec/bcrypt/engine_spec.rb
 - spec/bcrypt/password_spec.rb
 - spec/spec_helper.rb
-- ext/bcrypt.c
-- ext/bcrypt_ext.c
-- ext/blowfish.c
-- ext/blf.h
-- ext/extconf.rb
+- ext/mri/bcrypt.c
+- ext/mri/bcrypt_ext.c
+- ext/mri/blowfish.c
+- ext/mri/bcrypt.h
+- ext/mri/blf.h
+- ext/mri/extconf.rb
+- ext/jruby/bcrypt_jruby/BCrypt.java
+- ext/jruby/bcrypt_jruby/BCrypt.class
 has_rdoc: true
 homepage: http://bcrypt-ruby.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -65,9 +70,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bcrypt-ruby
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: OpenBSD's bcrypt() password hashing algorithm.
 test_files: []
 

data/ext/bcrypt_ext.c

@@ -1,36 +0,0 @@
-#include "ruby.h"
-#include "blf.h"
-
-char   *bcrypt_gensalt(u_int8_t, u_int8_t *);
-char   *bcrypt(const char *, const char *);
-
-VALUE mBCrypt;
-VALUE cBCryptEngine;
-
-/* Define RSTRING_PTR for Ruby 1.8.5, ruby-core's idea of a point release is
-   insane. */
-#ifndef RSTRING_PTR
-#  define    RSTRING_PTR(s)  (RSTRING(s)->ptr)
-#endif
-
-/* Given a logarithmic cost parameter, generates a salt for use with +bc_crypt+.
- */
-static VALUE bc_salt(VALUE self, VALUE cost, VALUE seed) {
-	return rb_str_new2((char *)bcrypt_gensalt(NUM2INT(cost), (u_int8_t *)RSTRING_PTR(seed)));
-}
-
-/* Given a secret and a salt, generates a salted hash (which you can then store safely).
- */
-static VALUE bc_crypt(VALUE self, VALUE key, VALUE salt) {
-	const char * safeguarded = RSTRING_PTR(key) ? RSTRING_PTR(key) : "";
-	return rb_str_new2((char *)bcrypt(safeguarded, (char *)RSTRING_PTR(salt)));
-}
-
-/* Create the BCrypt and BCrypt::Internals modules, and populate them with methods. */
-void Init_bcrypt_ext(){
-	mBCrypt = rb_define_module("BCrypt");
-	cBCryptEngine = rb_define_class_under(mBCrypt, "Engine", rb_cObject);
-	
-	rb_define_singleton_method(cBCryptEngine, "__bc_salt", bc_salt, 2);
-	rb_define_singleton_method(cBCryptEngine, "__bc_crypt", bc_crypt, 2);
-}

data/ext/extconf.rb

@@ -1,5 +0,0 @@
-require "mkmf"
-dir_config("bcrypt_ext")
-# enable this when we're feeling nitpicky
-# CONFIG['CC'] << " -Wall "
-create_makefile("bcrypt_ext")