scrypt 1.0.6 → 1.1.0

data/.gitignore

@@ -5,3 +5,5 @@ doc/*
 ext/mri/*.bundle
 *.o
 .DS_Store
+
+ext/mri/Makefile

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3

data/Gemfile.lock

@@ -1,14 +1,17 @@
 PATH
   remote: .
   specs:
-    scrypt (1.0.6)
+    scrypt (1.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     awesome_print (1.0.2)
     diff-lcs (1.1.3)
+    json (1.7.0)
     rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
       rspec-expectations (~> 2.9.0)
@@ -24,5 +27,6 @@ PLATFORMS
 DEPENDENCIES
   awesome_print
   rake (~> 0.9.2)
+  rdoc
   rspec
   scrypt!

data/README.md

@@ -1,4 +1,4 @@
-scrypt
+scrypt [![Build Status](https://secure.travis-ci.org/pbhogan/scrypt.png)](http://travis-ci.org/pbhogan/scrypt)
 ======
 
 The scrypt key derivation function is designed to be far more secure against hardware brute-force attacks than alternative functions such as PBKDF2 or bcrypt.
@@ -41,8 +41,10 @@ include "scrypt"
 @db_password == "a paltry guess"  #=> false
 ```
 
-Password.create takes three options which will determine the cost limits of the computation:
+Password.create takes five options which will determine the key length and salt size, as well as the cost limits of the computation:
 
+* `:key_len` specifies the length in bytes of the key you want to generate. The default is 32 bytes (256 bits). Minimum is 16 bytes (128 bits). Maximum is 512 bytes (4096 bits).
+* `:salt_size` specifies the size in bytes of the random salt you want to generate. The default and minimum is 8 bytes (64 bits). Maximum is 32 bytes (256 bits).
 * `:max_time` specifies the maximum number of seconds the computation should take.
 * `:max_mem` specifies the maximum number of bytes the computation should take. A value of 0 specifies no upper limit. The minimum is always 1 MB.
 * `:max_memfrac` specifies the maximum memory in a fraction of available resources to use. Any value equal to 0 or greater than 0.5 will result in 0.5 being used.

data/Rakefile

@@ -14,7 +14,7 @@ rd = Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'doc/rdoc'
   rdoc.options << '--title' << 'scrypt-ruby' << '--line-numbers' << '--inline-source' << '--main' << 'README'
   rdoc.template = ENV['TEMPLATE'] if ENV['TEMPLATE']
-  rdoc.rdoc_files.include('README', 'COPYING', 'CHANGELOG', 'lib/**/*.rb')
+  rdoc.rdoc_files.include('COPYING', 'lib/**/*.rb')
 end
 
 

data/ext/mri/scrypt_ext.c

@@ -24,49 +24,28 @@ static VALUE sc_calibrate( VALUE self, VALUE maxmem, VALUE maxmemfrac, VALUE max
 
 	if (calibrate( mm, mf, mt, & n, & r, & p ) == 0)
 	{
-		char cost_str[33];
-		memset( cost_str, '\0', 33 );
-		#ifdef __MINGW32__
-		sprintf( cost_str, "%lx$%x$%x$", (long unsigned int)n, (unsigned int)r, (unsigned int)p );
-		#else
-		sprintf( cost_str, "%Lx$%x$%x$", n, r, p );
-		#endif
-		return rb_str_new2( cost_str );
+		return rb_ary_new3( 3, UINT2NUM( n ), UINT2NUM( r ), UINT2NUM( p ));
 	}
 
 	return Qnil;
 }
 
 
-static VALUE sc_crypt( VALUE self, VALUE key, VALUE salt, VALUE cost )
+static VALUE sc_crypt( VALUE self, VALUE key, VALUE salt, VALUE n, VALUE r, VALUE p, VALUE keylen )
 {
-	uint64_t n = 0;
-	uint32_t r = 0;
-	uint32_t p = 0;
 	int result;
 
 	const char * safe_key = RSTRING_PTR(key) ? RSTRING_PTR(key) : "";
 	const char * safe_salt = RSTRING_PTR(salt) ? RSTRING_PTR(salt) : "";
 
-	const size_t buffer_size = 256;
+	const size_t buffer_size = NUM2UINT( keylen );
 	char buffer[buffer_size];
 	memset( buffer, '\0', buffer_size );
 
-	if (!RSTRING_PTR( cost ))
-	{
-		return Qnil;
-	}
-
-	#ifdef __MINGW32__
-	sscanf( RSTRING_PTR( cost ), "%lx$%x$%x$", (long unsigned int*)& n, (unsigned int*)& r, (unsigned int*)& p );
-	#else
-	sscanf( RSTRING_PTR( cost ), "%Lx$%x$%x$", & n, & r, & p );
-	#endif
-
 	result = crypto_scrypt(
 		(uint8_t *) safe_key, strlen(safe_key),
 		(uint8_t *) safe_salt, strlen(safe_salt),
-		n, r, p,
+		NUM2UINT( n ), NUM2UINT( r ), NUM2UINT( p ),
 		(uint8_t *) buffer, buffer_size
 	);
 
@@ -87,50 +66,5 @@ void Init_scrypt_ext()
 	cSCryptEngine = rb_define_class_under( mSCrypt, "Engine", rb_cObject );
 
 	rb_define_singleton_method( cSCryptEngine, "__sc_calibrate", sc_calibrate, 3 );
-	rb_define_singleton_method( cSCryptEngine, "__sc_crypt", sc_crypt, 3 );
-}
-
-
-/*
-#include <stdio.h>
-#include <string.h>
-#include "scrypt_calibrate.h"
-#include "crypto_scrypt.h"
-
-int main (int argc, const char * argv[])
-{
-	uint64_t n;
-	uint32_t r;
-	uint32_t p;
-
-	int result = calibrate( 0, 0.001, 0.25, & n, & r, & p );
-
-	printf( "%Ld %d %d \n", n, r, p );
-
-	char header[33];
-	sprintf( header, "%.16Lx%.8x%.8x", n, r, p );
-	printf( "%s \n", header );
-
-	uint64_t a = 0;
-	uint32_t b = 0;
-	uint32_t c = 0;
-	sscanf( header, "%16Lx%8x%8x", & a, & b, & c );
-	printf( "%Ld %d %d \n", a, b, c );
-
-	char password[] = "helloworld!";
-	char salt[] = "qwerty";
-	const size_t buffer_size = 32;
-	char buffer[buffer_size];
-	memset(buffer, '\0', buffer_size);
-
-	result = crypto_scrypt( (uint8_t *) password, strlen(password), (uint8_t *) salt, strlen(salt), n, r, p, (uint8_t *) buffer, buffer_size );
-
-	for (size_t i=0; i<buffer_size; i++)
-	{
-		printf( "%.2x", buffer[i] );
-	}
-	printf( "\n" );
-
-    return 0;
+	rb_define_singleton_method( cSCryptEngine, "__sc_crypt", sc_crypt, 6 );
 }
-*/

data/lib/scrypt.rb

@@ -3,12 +3,11 @@
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "ext", "mri")))
 require "scrypt_ext"
 require "openssl"
-require "digest/sha1"
 require "scanf"
 
 
 module SCrypt
-  
+
   module Errors
     class InvalidSalt   < StandardError; end  # The salt parameter provided is invalid.
     class InvalidHash   < StandardError; end  # The hash parameter provided is invalid.
@@ -16,21 +15,47 @@ module SCrypt
   end
 
   class Engine
-    DEFAULTS = { 
-      :max_mem => 1024 * 1024,
+    DEFAULTS = {
+      :key_len     => 32,
+      :salt_size   => 8,
+      :max_mem     => 1024 * 1024,
       :max_memfrac => 0.5,
-      :max_time => 0.2
+      :max_time    => 0.2
     }
 
     private_class_method :__sc_calibrate
     private_class_method :__sc_crypt
 
+    def self.scrypt(secret, salt, *args)
+      if args.length == 2
+        # args is [cost_string, key_len]
+        n, r, p = args[0].split('$').map{ |x| x.to_i(16) }
+        key_len = args[1]
+        __sc_crypt(secret, salt, n, r, p, key_len)
+      elsif args.length == 4
+        # args is [n, r, p, key_len]
+        n, r, p = args[0, 3]
+        key_len = args[3]
+        __sc_crypt(secret, salt, n, r, p, key_len)
+      else
+        raise ArgumentError.new("invalid number of arguments (4 or 6)")
+      end
+    end
+
     # Given a secret and a valid salt (see SCrypt::Engine.generate_salt) calculates an scrypt password hash.
-    def self.hash_secret(secret, salt)
+    def self.hash_secret(secret, salt, key_len = DEFAULTS[:key_len])
       if valid_secret?(secret)
         if valid_salt?(salt)
           cost = autodetect_cost(salt)
-          salt + "$" + Digest::SHA1.hexdigest(__sc_crypt(secret.to_s, salt, cost))
+          salt_only = salt[/\$([A-Za-z0-9]{16,64})$/, 1]
+          if salt_only.length == 40
+            # Old-style hash with 40-character salt
+            salt + "$" + Digest::SHA1.hexdigest(scrypt(secret.to_s, salt, cost, 256))
+          else
+            # New-style hash
+            salt_only = [salt_only.sub(/^(00)+/, '')].pack('H*')
+            salt + "$" + scrypt(secret.to_s, salt_only, cost, key_len).unpack('H*').first.rjust(key_len * 2, '0')
+          end
         else
           raise Errors::InvalidSalt.new("invalid salt")
         end
@@ -43,7 +68,11 @@ module SCrypt
     def self.generate_salt(options = {})
       options = DEFAULTS.merge(options)
       cost = calibrate(options)
-      salt = Digest::SHA1.hexdigest(OpenSSL::Random.random_bytes(32))
+      salt = OpenSSL::Random.random_bytes(options[:salt_size]).unpack('H*').first.rjust(16,'0')
+      if salt.length == 40
+        #If salt is 40 characters, the regexp will think that it is an old-style hash, so add a '0'.
+        salt = '0' + salt
+      end
       cost + salt
     end
 
@@ -54,7 +83,7 @@ module SCrypt
 
     # Returns true if +salt+ is a valid salt, false if not.
     def self.valid_salt?(salt)
-      salt.match(/^[0-9a-z]+\$[0-9a-z]+\$[0-9a-z]+\$[A-Za-z0-9]{20,}$/) != nil
+      salt.match(/^[0-9a-z]+\$[0-9a-z]+\$[0-9a-z]+\$[A-Za-z0-9]{16,64}$/) != nil
     end
 
     # Returns true if +secret+ is a valid secret, false if not.
@@ -76,9 +105,9 @@ module SCrypt
     #
     def self.calibrate(options = {})
       options = DEFAULTS.merge(options)
-      __sc_calibrate(options[:max_mem], options[:max_memfrac], options[:max_time])
+      "%x$%x$%x$" % __sc_calibrate(options[:max_mem], options[:max_memfrac], options[:max_time])
     end
-    
+
     # Computes the memory use of the given +cost+
     def self.memory_use(cost)
       n, r, p = cost.scanf("%x$%x$%x$")
@@ -121,8 +150,10 @@ module SCrypt
     attr_reader :cost
 
     class << self
-      # Hashes a secret, returning a SCrypt::Password instance. 
-      # Takes three options (optional), which will determine the cost limits of the computation.
+      # Hashes a secret, returning a SCrypt::Password instance.
+      # Takes five options (optional), which will determine the salt/key's length and the cost limits of the computation.
+      # <tt>:key_len</tt> specifies the length in bytes of the key you want to generate. The default is 32 bytes (256 bits). Minimum is 16 bytes (128 bits). Maximum is 512 bytes (4096 bits).
+      # <tt>:salt_size</tt> specifies the size in bytes of the random salt you want to generate. The default and minimum is 8 bytes (64 bits). Maximum is 32 bytes (256 bits).
       # <tt>:max_time</tt> specifies the maximum number of seconds the computation should take.
       # <tt>:max_mem</tt> specifies the maximum number of bytes the computation should take. A value of 0 specifies no upper limit. The minimum is always 1 MB.
       # <tt>:max_memfrac</tt> specifies the maximum memory in a fraction of available resources to use. Any value equal to 0 or greater than 0.5 will result in 0.5 being used.
@@ -135,8 +166,14 @@ module SCrypt
       #
       def create(secret, options = {})
         options = SCrypt::Engine::DEFAULTS.merge(options)
+        #Clamp minimum/maximum keylen
+        options[:key_len] = 16 if options[:key_len] < 16
+        options[:key_len] = 512 if options[:key_len] > 512
+        #Clamp minimum/maximum salt_size
+        options[:salt_size] = 8 if options[:salt_size] < 8
+        options[:salt_size] = 32 if options[:salt_size] > 32
         salt = SCrypt::Engine.generate_salt(options)
-        hash = SCrypt::Engine.hash_secret(secret, salt)
+        hash = SCrypt::Engine.hash_secret(secret, salt, options[:key_len])
         Password.new(hash)
       end
     end
@@ -153,14 +190,14 @@ module SCrypt
 
     # Compares a potential secret against the hash. Returns true if the secret is the original secret, false otherwise.
     def ==(secret)
-      super(SCrypt::Engine.hash_secret(secret, @cost + @salt))
+      super(SCrypt::Engine.hash_secret(secret, @cost + @salt, self.hash.length / 2))
     end
     alias_method :is_password?, :==
 
   private
     # Returns true if +h+ is a valid hash.
     def valid_hash?(h)
-      h.match(/^[0-9a-z]+\$[0-9a-z]+\$[0-9a-z]+\$[A-Za-z0-9]{20,}\$[A-Za-z0-9]{20,}$/) != nil
+      h.match(/^[0-9a-z]+\$[0-9a-z]+\$[0-9a-z]+\$[A-Za-z0-9]{16,64}\$[A-Za-z0-9]{32,1024}$/) != nil
     end
 
     # call-seq:

data/lib/scrypt/version.rb

@@ -1,3 +1,3 @@
 module SCrypt
-  VERSION = "1.0.6"
+  VERSION = "1.1.0"
 end

data/scrypt.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   EOF
 
   s.add_development_dependency "rspec"
+  s.add_development_dependency "rdoc"
   s.add_development_dependency "rake", "~> 0.9.2"
   s.add_development_dependency "awesome_print"
 

data/spec/scrypt/engine_spec.rb

@@ -56,3 +56,18 @@ describe "Generating SCrypt hashes" do
   end
 end
 
+describe "SCrypt test vectors" do
+  it "should match results of SCrypt function" do
+    SCrypt::Engine.scrypt('', '', 16, 1, 1, 64).unpack('H*').first.should eq('77d6576238657b203b19ca42c18a0497f16b4844e3074ae8dfdffa3fede21442fcd0069ded0948f8326a753a0fc81f17e8d3e0fb2e0d3628cf35e20c38d18906')
+    SCrypt::Engine.scrypt('password', 'NaCl', 1024, 8, 16, 64).unpack('H*').first.should eq('fdbabe1c9d3472007856e7190d01e9fe7c6ad7cbc8237830e77376634b3731622eaf30d92e22a3886ff109279d9830dac727afb94a83ee6d8360cbdfa2cc0640')
+    SCrypt::Engine.scrypt('pleaseletmein', 'SodiumChloride', 16384, 8, 1, 64).unpack('H*').first.should eq('7023bdcb3afd7348461c06cd81fd38ebfda8fbba904f8e3ea9b543f6545da1f2d5432955613f0fcf62d49705242a9af9e61e85dc0d651e40dfcf017b45575887')
+    SCrypt::Engine.scrypt('pleaseletmein', 'SodiumChloride', 1048576, 8, 1, 64).unpack('H*').first.should eq('2101cb9b6a511aaeaddbbe09cf70f881ec568d574a2ffd4dabe5ee9820adaa478e56fd8f4ba5d09ffa1c6d927c40f4c337304049e8a952fbcbf45c6fa77a41a4')
+  end
+
+  it "should match equivalent results sent through hash_secret() function" do
+    SCrypt::Engine.hash_secret('', '10$1$1$0000000000000000', 64).should match(/\$77d6576238657b203b19ca42c18a0497f16b4844e3074ae8dfdffa3fede21442fcd0069ded0948f8326a753a0fc81f17e8d3e0fb2e0d3628cf35e20c38d18906$/)
+    SCrypt::Engine.hash_secret('password', '400$8$10$000000004e61436c', 64).should match(/\$fdbabe1c9d3472007856e7190d01e9fe7c6ad7cbc8237830e77376634b3731622eaf30d92e22a3886ff109279d9830dac727afb94a83ee6d8360cbdfa2cc0640$/)
+    SCrypt::Engine.hash_secret('pleaseletmein', '4000$8$1$536f6469756d43686c6f72696465', 64).should match(/\$7023bdcb3afd7348461c06cd81fd38ebfda8fbba904f8e3ea9b543f6545da1f2d5432955613f0fcf62d49705242a9af9e61e85dc0d651e40dfcf017b45575887$/)
+    SCrypt::Engine.hash_secret('pleaseletmein', '100000$8$1$536f6469756d43686c6f72696465', 64).should match(/\$2101cb9b6a511aaeaddbbe09cf70f881ec568d574a2ffd4dabe5ee9820adaa478e56fd8f4ba5d09ffa1c6d927c40f4c337304049e8a952fbcbf45c6fa77a41a4$/)
+  end
+end

data/spec/scrypt/password_spec.rb

@@ -45,7 +45,6 @@ describe "Reading a hashed password" do
   end
 end
 
-
 describe "Comparing a hashed password with a secret" do
   before :each do
     @secret = "s3cr3t"
@@ -59,5 +58,75 @@ describe "Comparing a hashed password with a secret" do
   it "should compare unsuccessfully to anything besides original secret" do
     (@password == "@secret").should be(false)
   end
+
 end
 
+describe "non-default salt sizes" do
+  before :each do
+    @secret = "s3cret"
+  end
+
+  it "should enforce a minimum salt of 8 bytes" do
+    @password = SCrypt::Password.create(@secret, :salt_size => 7)
+    @password.salt.length.should eq(8 * 2)
+  end
+
+  it "should allow a salt of 32 bytes" do
+    @password = SCrypt::Password.create(@secret, :salt_size => 32)
+    @password.salt.length.should eq(32 * 2)
+  end
+
+  it "should enforce a maximum salt of 32 bytes" do
+    @password = SCrypt::Password.create(@secret, :salt_size => 33)
+    @password.salt.length.should eq(32 * 2)
+  end
+
+  it "should pad a 20-byte salt to not look like a 20-byte SHA1" do
+    @password = SCrypt::Password.create(@secret, :salt_size => 20)
+    @password.salt.length.should eq(41)
+  end
+
+  it "should properly compare a non-standard salt hash" do
+    @password = SCrypt::Password.create(@secret, :salt_size => 20)
+    (SCrypt::Password.new(@password.to_s) == @secret).should be(true)
+  end
+
+end
+
+describe "non-default key lengths" do
+  before :each do
+    @secret = "s3cret"
+  end
+
+  it "should enforce a minimum keylength of 16 bytes" do
+    @password = SCrypt::Password.create(@secret, :key_len => 15)
+    @password.hash.length.should eq(16 * 2)
+  end
+
+  it "should allow a keylength of 512 bytes" do
+    @password = SCrypt::Password.create(@secret, :key_len => 512)
+    @password.hash.length.should eq(512 * 2)
+  end
+
+  it "should enforce a maximum keylength of 512 bytes" do
+    @password = SCrypt::Password.create(@secret, :key_len => 513)
+    @password.hash.length.should eq(512 * 2)
+  end
+
+  it "should properly compare a non-standard hash" do
+    @password = SCrypt::Password.create(@secret, :key_len => 512)
+    (SCrypt::Password.new(@password.to_s) == @secret).should be(true)
+  end
+
+end
+
+describe "Old-style hashes" do
+  before :each do
+    @secret = "my secret"
+    @hash = "400$8$d$173a8189751c095a29b933789560b73bf17b2e01$9bf66d74bd6f3ebcf99da3b379b689b89db1cb07"
+  end
+
+  it "should compare successfully" do
+    (SCrypt::Password.new(@hash) == @secret).should be(true)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scrypt
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +88,13 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
-- CHANGELOG
+- .travis.yml
 - COPYING
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
 - autotest/discover.rb
-- ext/mri/Makefile
 - ext/mri/alt-impl/crypto_scrypt-nosse.c
 - ext/mri/alt-impl/crypto_scrypt-ref.c
 - ext/mri/crypto_scrypt-sse.c
@@ -117,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4242054223667576181
+      hash: -214930008180539210
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4242054223667576181
+      hash: -214930008180539210
 requirements: []
 rubyforge_project: scrypt
 rubygems_version: 1.8.21

data/CHANGELOG

@@ -1,3 +0,0 @@
-1.0.0	December 15, 2010
- - Initial release.
- 

data/ext/mri/Makefile

@@ -1,213 +0,0 @@
-
-SHELL = /bin/sh
-
-# V=0 quiet, V=1 verbose.  other values don't work.
-V = 0
-Q1 = $(V:1=)
-Q = $(Q1:0=@)
-n=$(NULLCMD)
-ECHO1 = $(V:1=@$n)
-ECHO = $(ECHO1:0=@echo)
-
-#### Start of system configuration section. ####
-
-srcdir = .
-topdir = /Volumes/Secondary/Users/pbhogan/.rvm/rubies/ruby-1.9.3-p125/include/ruby-1.9.1
-hdrdir = /Volumes/Secondary/Users/pbhogan/.rvm/rubies/ruby-1.9.3-p125/include/ruby-1.9.1
-arch_hdrdir = /Volumes/Secondary/Users/pbhogan/.rvm/rubies/ruby-1.9.3-p125/include/ruby-1.9.1/$(arch)
-VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = $(DESTDIR)/Volumes/Secondary/Users/pbhogan/.rvm/rubies/ruby-1.9.3-p125
-rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
-exec_prefix = $(prefix)
-vendorhdrdir = $(rubyhdrdir)/vendor_ruby
-sitehdrdir = $(rubyhdrdir)/site_ruby
-rubyhdrdir = $(includedir)/$(RUBY_BASE_NAME)-$(ruby_version)
-vendordir = $(rubylibprefix)/vendor_ruby
-sitedir = $(rubylibprefix)/site_ruby
-ridir = $(datarootdir)/$(RI_BASE_NAME)
-mandir = $(datarootdir)/man
-localedir = $(datarootdir)/locale
-libdir = $(exec_prefix)/lib
-psdir = $(docdir)
-pdfdir = $(docdir)
-dvidir = $(docdir)
-htmldir = $(docdir)
-infodir = $(datarootdir)/info
-docdir = $(datarootdir)/doc/$(PACKAGE)
-oldincludedir = $(DESTDIR)/usr/include
-includedir = $(prefix)/include
-localstatedir = $(prefix)/var
-sharedstatedir = $(prefix)/com
-sysconfdir = $(prefix)/etc
-datadir = $(datarootdir)
-datarootdir = $(prefix)/share
-libexecdir = $(exec_prefix)/libexec
-sbindir = $(exec_prefix)/sbin
-bindir = $(exec_prefix)/bin
-rubylibdir = $(rubylibprefix)/$(ruby_version)
-archdir = $(rubylibdir)/$(arch)
-sitelibdir = $(sitedir)/$(ruby_version)
-sitearchdir = $(sitelibdir)/$(sitearch)
-vendorlibdir = $(vendordir)/$(ruby_version)
-vendorarchdir = $(vendorlibdir)/$(sitearch)
-
-NULLCMD = :
-
-CC = /usr/bin/gcc-4.2 -Wall -msse -msse2 
-CXX = g++-4.2
-LIBRUBY = $(LIBRUBY_SO)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-OUTFLAG = -o 
-COUTFLAG = -o 
-
-RUBY_EXTCONF_H = 
-cflags   =  $(optflags) $(debugflags) $(warnflags)
-optflags = -O3
-debugflags = -g
-warnflags = -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration
-CFLAGS   = -fno-common $(cflags)  -fno-common -pipe $(ARCH_FLAG)
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
-DEFS     = 
-CPPFLAGS =  -I/Volumes/Secondary/Users/pbhogan/.rvm/usr/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
-CXXFLAGS = $(CFLAGS) $(cxxflags)
-ldflags  = -L. -L/usr/local/lib
-dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress -Wl,-flat_namespace
-ARCH_FLAG = 
-DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
-LDSHARED = $(CC) -dynamic -bundle
-LDSHAREDXX = $(CXX) -dynamic -bundle
-AR = ar
-EXEEXT = 
-
-RUBY_BASE_NAME = ruby
-RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby.1.9.1
-arch = x86_64-darwin11.3.0
-sitearch = $(arch)
-ruby_version = 1.9.1
-ruby = /Volumes/Secondary/Users/pbhogan/.rvm/rubies/ruby-1.9.3-p125/bin/ruby
-RUBY = $(ruby)
-RM = rm -f
-RM_RF = $(RUBY) -run -e rm -- -rf
-RMDIRS = rmdir -p
-MAKEDIRS = mkdir -p
-INSTALL = /usr/bin/install -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = . $(libdir) /Volumes/Secondary/Users/pbhogan/.rvm/usr/lib
-LIBPATH =  -L. -L$(libdir) -L/Volumes/Secondary/Users/pbhogan/.rvm/usr/lib
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-DISTCLEANDIRS = 
-
-extout = 
-extout_prefix = 
-target_prefix = 
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc 
-SRCS = crypto_scrypt-sse.c memlimit.c scrypt_calibrate.c scrypt_ext.c scryptenc_cpuperf.c sha256.c
-OBJS = crypto_scrypt-sse.o memlimit.o scrypt_calibrate.o scrypt_ext.o scryptenc_cpuperf.o sha256.o
-TARGET = scrypt_ext
-DLLIB = $(TARGET).bundle
-EXTSTATIC = 
-STATIC_LIB = 
-
-BINDIR        = $(bindir)
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
-ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).bundle 
-CLEANOBJS     = *.o  *.bak
-
-all:    $(DLLIB)
-static: $(STATIC_LIB)
-.PHONY: all install static install-so install-rb
-.PHONY: clean clean-so clean-rb
-
-clean-rb-default::
-clean-rb::
-clean-so::
-clean: clean-so clean-rb-default clean-rb
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
-
-distclean-rb-default::
-distclean-rb::
-distclean-so::
-distclean: clean distclean-so distclean-rb-default distclean-rb
-		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-		@-$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
-
-realclean: distclean
-install: install-so install-rb
-
-install-so: $(RUBYARCHDIR)
-install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_PROG) $(DLLIB) $(@D)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-pre-install-rb-default:
-	$(ECHO) installing default scrypt_ext libraries
-$(RUBYARCHDIR):
-	$(Q) $(MAKEDIRS) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .mm .cxx .cpp .C .o
-
-.cc.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.mm.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.cxx.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.cpp.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.C.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.c.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
-
-.m.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
-
-$(DLLIB): $(OBJS) Makefile
-	$(ECHO) linking shared-object $(DLLIB)
-	@-$(RM) $(@)
-	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h