digest-siphash 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c27f151cfd6e1509a0b7b8086b872f697faa1da9
-  data.tar.gz: 24c64c35d7be6a31e1099f272e79d638778f1e8f
+  metadata.gz: cc0ecdf1ed635eda8af63f049c68245e9a4e3874
+  data.tar.gz: 1d249556827c6649878931206361e3a861eaf77b
 SHA512:
-  metadata.gz: e073e6bdc4e2d985eb7ab22fb253d2460120bcda4fc71f4fd033ee52e473abf06f5ffbffe2e64b7aef9ea652e867815a468b9f9125f2068ef52125b77dd7f263
-  data.tar.gz: ade5bfd91c2b4403d7463f5d4d934e80d0e41a5abba1ca9fe5944797dd1ba7a3d28dd192c4e8f96c4ae86193c154c26380bdae4af0006f9076fce8991d6f257b
+  metadata.gz: d80408d9eff05f9ddd1627e51ff18eb4462c96a92c556987d36d254ca6ce610bc59667236c6e2aac0869ebf45a883c246a43b4693cdbf39d12832128ce4b43f4
+  data.tar.gz: 103adac3d2c95a8d6be607eb9c6a8de5ba9c5d3d0af3b3d4595f12ca3631d6dedc29d86e2e5391693036563010a71c6d34d11622f7d621747d556bc3294d8d6b

data/.travis.yml

@@ -3,4 +3,3 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
-  - 2.2.0

data/README.md

@@ -27,11 +27,11 @@ and other way. instance use.
 ```ruby
 siphash = Digest::SipHash.new
 siphash.update "siphash"
-p siphash.digest #=> "\x88\x27\x68\x57\x0d\xc7\x1c\x92"
+p siphash.hexdigest #=> "59caaeb90d542464"
 
 # of course, can change seed value.
 siphash.seed = (0..0x0f).to_a.pack("C16")
-p siphash.hexdigest "siphash" #=> "882768570dc71c92"
+p siphash.hexdigest #=> "882768570dc71c92"
 ```
 
 ## Installation

data/digest-siphash.gemspec

@@ -2,11 +2,13 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
+require 'digest/siphash'
+
 Gem::Specification.new do |spec|
   spec.name          = "digest-siphash"
-  spec.version       = "0.0.1"
-  spec.authors       = "ksss"
-  spec.email         = "co000ri@gmail.com"
+  spec.version       = Digest::SipHash::VERSION
+  spec.authors       = ["ksss"]
+  spec.email         = ["co000ri@gmail.com"]
   spec.summary       = %q{Digest::SipHash is a class of message digest use algorithm SipHash.}
   spec.description   = %q{Digest::SipHash is a class of message digest use algorithm SipHash.}
   spec.homepage      = ""
@@ -18,9 +20,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions    = ["ext/digest/siphash/extconf.rb"]
 
-  spec.add_runtime_dependency "digest-stringbuffer", ["~> 0.0.2"]
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_runtime_dependency "digest-simple"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", ['~> 2.11']
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "rake-compiler", ["~> 0.8.3"]
 end

data/ext/digest/siphash/init.c

@@ -2,30 +2,11 @@
 #include "siphash.h"
 
 #define siphash crypto_auth
-#define DEFAULT_SEED "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
 
 VALUE cDigest_SipHash;
 ID id_DEFAULT_SEED;
-ID id_seed;
-
-static VALUE
-siphash_seed_get(VALUE self)
-{
-	if (!rb_ivar_defined(self, id_seed)) {
-		rb_ivar_set(self, id_seed, rb_usascii_str_new(DEFAULT_SEED, 16));
-	}
-	return rb_ivar_get(self, id_seed);
-}
-
-static VALUE
-siphash_seed_set(VALUE self, VALUE obj)
-{
-	StringValue(obj);
-	if (RSTRING_LEN(obj) != 16) {
-		rb_raise(rb_eArgError, "seed string should 128 bit chars");
-	}
-	return rb_ivar_set(self, id_seed, obj);
-}
+ID iv_seed;
+ID iv_buffer;
 
 static void
 _siphash_s_digest(uint8_t* digest, int argc, VALUE *argv)
@@ -57,11 +38,11 @@ static inline void
 _siphash_finish(uint8_t *digest, VALUE self)
 {
 	const unsigned char *seed;
-	buffer_t *ptr;
+	VALUE buffer;
 
-	Data_Get_Struct(self, buffer_t, ptr);
-	seed = (const unsigned char *) RSTRING_PTR(siphash_seed_get(self));
-	siphash(digest, (const unsigned char *) ptr->buffer, ptr->p - ptr->buffer, seed);
+	buffer = rb_ivar_get(self, iv_buffer);
+	seed = (const unsigned char *) RSTRING_PTR(rb_ivar_get(self, iv_seed));
+	siphash(digest, (const unsigned char *) RSTRING_PTR(buffer), RSTRING_LEN(buffer), seed);
 }
 
 static VALUE
@@ -82,14 +63,6 @@ siphash_finish(VALUE self)
 	return rb_str_new((const char*) digest, 8);
 }
 
-static VALUE
-siphash_to_i(VALUE self)
-{
-	uint8_t digest[8];
-	_siphash_finish(digest, self);
-	return ULL2NUM(*(uint64_t *) digest);
-}
-
 static VALUE
 siphash_s_digest(int argc, VALUE *argv, VALUE klass)
 {
@@ -108,40 +81,33 @@ siphash_s_digest(int argc, VALUE *argv, VALUE klass)
 	return rb_str_new((const char*) digest, 8);
 }
 
-static VALUE
-siphash_s_hexdigest(int argc, VALUE *argv, VALUE klass)
-{
-	return hexencode_str_new(siphash_s_digest(argc, argv, klass));
-}
-
 static VALUE
 siphash_s_rawdigest(int argc, VALUE *argv, VALUE klass)
 {
 	uint8_t digest[8];
+#if LITTLE_ENDIAN
+	uint8_t roll[8];
+	int i;
+#endif
 	_siphash_s_digest(digest, argc, argv);
+#if LITTLE_ENDIAN
+	for (i = 0; i < 8; i++) {
+		roll[i] = digest[7 - i];
+	}
+	memcpy(digest, roll, 8);
+#endif
 	return ULL2NUM(*(uint64_t *) digest);
 }
 
 void
 Init_siphash(void)
 {
-	VALUE mDigest, cDigest_StringBuffer;
-
 	id_DEFAULT_SEED = rb_intern("DEFAULT_SEED");
-	id_seed = rb_intern("seed");
-
-	/* Digest::SipHash is require that Digest::StringBuffer */
-	mDigest = rb_path2class("Digest");
-	cDigest_StringBuffer = rb_path2class("Digest::StringBuffer");
+	iv_buffer = rb_intern("@buffer");
+	iv_seed = rb_intern("@seed");
 
-	/* class Digest::SipHash < Digest::StringBuffer */
-	cDigest_SipHash = rb_define_class_under(mDigest, "SipHash", cDigest_StringBuffer);
+	cDigest_SipHash = rb_path2class("Digest::SipHash");
 	rb_define_private_method(cDigest_SipHash, "finish", siphash_finish, 0);
-	rb_define_method(cDigest_SipHash, "to_i", siphash_to_i, 0);
-	rb_define_method(cDigest_SipHash, "seed", siphash_seed_get, 0);
-	rb_define_method(cDigest_SipHash, "seed=", siphash_seed_set, 1);
-	rb_define_const(cDigest_SipHash, "DEFAULT_SEED", rb_usascii_str_new(DEFAULT_SEED, 16));
 	rb_define_singleton_method(cDigest_SipHash, "digest", siphash_s_digest, -1);
-	rb_define_singleton_method(cDigest_SipHash, "hexdigest", siphash_s_hexdigest, -1);
 	rb_define_singleton_method(cDigest_SipHash, "rawdigest", siphash_s_rawdigest, -1);
 }

data/ext/digest/siphash/siphash.h

@@ -20,49 +20,4 @@
 #  define LITTLE_ENDIAN 0
 #endif
 
-/* should be same type structure to digest/stringbuffer */
-typedef struct {
-	char* buffer;
-	char* p;
-	size_t memsize;
-} buffer_t;
-
-/*
- * from https://github.com/ruby/ruby/blob/trunk/ext/digest/digest.c
- * Copyright (C) 1995-2001 Yukihiro Matsumoto
- * Copyright (C) 2001-2006 Akinori MUSHA
- */
-static VALUE
-hexencode_str_new(VALUE str_digest)
-{
-	char *digest;
-	size_t digest_len;
-	size_t i;
-	VALUE str;
-	char *p;
-	static const char hex[] = {
-		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-		'a', 'b', 'c', 'd', 'e', 'f'
-	};
-
-	StringValue(str_digest);
-	digest = RSTRING_PTR(str_digest);
-	digest_len = RSTRING_LEN(str_digest);
-
-	if (LONG_MAX / 2 < digest_len) {
-		rb_raise(rb_eRuntimeError, "digest string too long");
-	}
-
-	str = rb_usascii_str_new(0, digest_len * 2);
-
-	for (i = 0, p = RSTRING_PTR(str); i < digest_len; i++) {
-		unsigned char byte = digest[i];
-
-		p[i + i]     = hex[byte >> 4];
-		p[i + i + 1] = hex[byte & 0x0f];
-	}
-
-	return str;
-}
-
 #endif /* ifndef SIPHASH_INCLUDED */

data/lib/digest/siphash.rb

@@ -1,6 +1,29 @@
-require "digest/stringbuffer"
-begin
-  require "digest/siphash/#{RUBY_VERSION[/\d+.\d+/]}/siphash"
-rescue LoadError
-  require "digest/siphash/siphash"
+require 'digest'
+require "digest/simple"
+
+module Digest
+  class SipHash < Simple
+    VERSION = "1.0.0"
+    DEFAULT_SEED = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".encode('ASCII-8BIT')
+
+    def initialize
+      @seed = DEFAULT_SEED
+      super
+    end
+
+    def seed
+      @seed
+    end
+
+    def seed=(s)
+      fail ArgumentError, "seed string should 128 bit chars" if s.bytesize != 16
+      @seed = s
+    end
+
+    def to_i
+      finish.unpack("Q")[0]
+    end
+  end
 end
+
+require "digest/siphash/siphash"

data/spec/digest_spec.rb

@@ -7,7 +7,7 @@ describe Digest::SipHash do
   end
 
   it "initialize" do
-    expect(SipHash.new).to be_a_kind_of(StringBuffer)
+    expect(SipHash.new).to be_a_kind_of(Digest::Class)
   end
 
   it "DEFAULT_SEED" do
@@ -40,21 +40,21 @@ describe Digest::SipHash do
   end
 
   it "rawdigest" do
-    expect(SipHash.rawdigest("")).to eq(0x1e924b9d737700d7)
-    expect(SipHash.rawdigest("", seed)).to eq(0x726fdb47dd0e0e31)
-    expect(SipHash.rawdigest("\x00", seed)).to eq(0x74f839c593dc67fd)
-    expect(SipHash.rawdigest("\x00\x01", seed)).to eq(0x0d6c8009d9a94f5a)
+    expect(SipHash.rawdigest("")).to eq(0xd70077739d4b921e)
+    expect(SipHash.rawdigest("", seed)).to eq(0x310e0edd47db6f72)
+    expect(SipHash.rawdigest("\x00", seed)).to eq(0xfd67dc93c539f874)
+    expect(SipHash.rawdigest("\x00\x01", seed)).to eq(0x5a4fa9d909806c0d)
   end
 
   it "instance digest" do
     sip = SipHash.new
     sip.update ""
     expect(sip.digest).to eq("\x1e\x92\x4b\x9d\x73\x77\x00\xd7")
-    expect(sip.to_i).to eq(0x1e924b9d737700d7)
-    
+    expect(sip.to_i).to eq(0xd70077739d4b921e)
+
     sip.seed = seed
     expect(sip.digest).to eq("\x72\x6f\xdb\x47\xdd\x0e\x0e\x31")
-    expect(sip.to_i).to eq(0x726fdb47dd0e0e31)
+    expect(sip.to_i).to eq(0x310e0edd47db6f72)
   end
 end
 

metadata

@@ -1,94 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: digest-siphash
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-01 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: digest-stringbuffer
+  name: digest-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
 description: Digest::SipHash is a class of message digest use algorithm SipHash.
-email: co000ri@gmail.com
+email:
+- co000ri@gmail.com
 executables: []
 extensions:
 - ext/digest/siphash/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -113,17 +114,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Digest::SipHash is a class of message digest use algorithm SipHash.