fastpbkdf2 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 986b8e83bd6d157efa281fcb0e5f137153a3e67c
-  data.tar.gz: 34841f44f77a35343122ae7891f8083febf68bfc
+  metadata.gz: 16883f21fbcfd33359a5aefb025f342b98a2c6da
+  data.tar.gz: 9b5f6000d448b714c4d4eb2866e773edc6c9e6fe
 SHA512:
-  metadata.gz: a7a9ea8322183fe84df4037a04e9ea1c6ef2cd3a1abc218e22f0da94a3f20b934c0d8adf5a9803adb4ac7eeae4aa61a7e2f067ccf52091d08769cfaa9b6fbadd
-  data.tar.gz: a119f1e7cb847e3a1674d37b759be06db62d0dd3925fd2c9079782a6d1ff96e190dc28bbbfb74a777da694186d993b650aa6dcbe57562f8bbdd953fdcb36a733
+  metadata.gz: 8390afdeded31598004738bbcd9455c2622c66a7cbb7fd811f6e1fb74ae95ede7be34138d11bce37adf928793c7a83187636abe012e1a9e76ad95a61a042af31
+  data.tar.gz: 1b3e26a44bb4aaf41f8bd88ddd618ba7dcea518363de3fe9b7abebbc35f3a82a933583461cb2aac0750e1325ec5b3a0dc322e1c832e7725be210a9d7f781cab5

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake/extensiontask'
 
-spec = Gem::Specification.load('fastpbkdf2.gemspec')
+spec = Gem::Specification.load('.gemspec')
 Rake::ExtensionTask.new('fastpbkdf2_native', spec)
 
 require 'rake/testtask'
@@ -9,3 +9,5 @@ Rake::TestTask.new do |t|
   t.test_files = FileList['test/ruby/test*.rb']
   t.verbose = true
 end
+
+task :default => :compile

data/ext/fastpbkdf2_native/binding.c

@@ -3,52 +3,55 @@
 
 static VALUE fastpbkdf2;
 
-static VALUE Sha1(VALUE self, VALUE _pw, VALUE _salt, VALUE _iterations, VALUE _keylen) {
-	uint8_t *pw = NULL, *salt = NULL;
-	size_t npw, nsalt;
-	unsigned int iterations, keylen;
-	unsigned char out[2048] = {0};
-	VALUE result;
-
-	Check_Type(_pw, T_STRING);
-	pw = (unsigned char*) RSTRING_PTR(_pw);
-	npw = RSTRING_LEN(_pw);
-	if (npw > 1024) {
-		rb_raise(rb_eRangeError, "password length must be between 0 and 1024");
-	}
-	// printf("pw: %s\n", pw);
-
-	Check_Type(_salt, T_STRING);
-	salt = (unsigned char*) RSTRING_PTR(_salt);
-	nsalt = RSTRING_LEN(_salt);
-	if (nsalt > 1024) {
-		rb_raise(rb_eRangeError, "salt length must be between 0 and 1024");
-	}
-	// printf("salt: %s\n", salt);
-
-	Check_Type(_iterations, T_FIXNUM);
-	iterations = NUM2ULL(_iterations);
-	if (iterations <= 0) {
-		rb_raise(rb_eRangeError, "iterations must be greater than 0");
-	}
-	// printf("iterations: %d\n", iterations);
-
-	Check_Type(_keylen, T_FIXNUM);
-	keylen = NUM2ULL(_keylen);
-	if (keylen <= 0 || keylen > 1024) {
-		rb_raise(rb_eRangeError, "keylen must be between 1 and 1024");
-	}
-	// printf("keylen: %d\n", keylen);
-
-	fastpbkdf2_hmac_sha1(pw, npw, salt, nsalt, iterations, out, keylen);
-
-	result = rb_str_new(out, keylen);
-
-	return result;
+#define DECL(ALGORITHM) \
+static VALUE ALGORITHM(VALUE self, VALUE _pw, VALUE _salt, VALUE _iterations, VALUE _keylen) {\
+	uint8_t *pw = NULL, *salt = NULL;\
+	size_t npw, nsalt;\
+	unsigned int iterations, keylen;\
+	unsigned char out[2048];\
+	VALUE result;\
+\
+	Check_Type(_pw, T_STRING);\
+	pw = (uint8_t*) RSTRING_PTR(_pw);\
+	npw = RSTRING_LEN(_pw);\
+	if (npw > 1024) {\
+		rb_raise(rb_eRangeError, "password length must be between 0 and 1024");\
+	}\
+\
+	Check_Type(_salt, T_STRING);\
+	salt = (uint8_t*) RSTRING_PTR(_salt);\
+	nsalt = RSTRING_LEN(_salt);\
+	if (nsalt > 1024) {\
+		rb_raise(rb_eRangeError, "salt length must be between 0 and 1024");\
+	}\
+\
+	Check_Type(_iterations, T_FIXNUM);\
+	iterations = NUM2ULL(_iterations);\
+	if (iterations <= 0) {\
+		rb_raise(rb_eRangeError, "iterations must be greater than 0");\
+	}\
+\
+	Check_Type(_keylen, T_FIXNUM);\
+	keylen = NUM2ULL(_keylen);\
+	if (keylen <= 0 || keylen > 1024) {\
+		rb_raise(rb_eRangeError, "keylen must be between 1 and 1024");\
+	}\
+\
+	fastpbkdf2_hmac_##ALGORITHM(pw, npw, salt, nsalt, iterations, out, keylen);\
+\
+	result = rb_str_new((char *)out, keylen);\
+\
+	return result;\
 }
 
+DECL(sha1)
+DECL(sha256)
+DECL(sha512)
+
 void Init_fastpbkdf2_native(void) {
 	fastpbkdf2 = rb_define_module("Fastpbkdf2");
 
-	rb_define_module_function(fastpbkdf2, "sha1", Sha1, 4);
+	rb_define_module_function(fastpbkdf2, "sha1", sha1, 4);
+	rb_define_module_function(fastpbkdf2, "sha256", sha256, 4);
+	rb_define_module_function(fastpbkdf2, "sha512", sha512, 4);
 }

data/lib/fastpbkdf2.rb

@@ -1,14 +1 @@
-require 'fastpbkdf2_native'
-
-#"\x0c\x60\xc8\x0f\x96\x1f\x0e\x71\xf3\xa9\xb5\x24\xaf\x60\x12\x06\x2f\xe0\x37\xa6"
-
-
-# class LZ4
-#   def self.compress(source)
-#     return LZ4Native::compress(source)
-#   end
-
-#   def self.uncompress(source)
-#     return LZ4Native::uncompress(source)
-#   end
-# end
+require 'fastpbkdf2_native'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastpbkdf2
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - S-YOU
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler