digest-kangarootwelve 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50d1bcef2a3a7241ec3ea218feff65028968e715bd275b004939b2add9c97474
-  data.tar.gz: 59ba3a8f2663ec6a735d8569b0991bfd77c72b7242ed866b44115dfa5d37cef7
+  metadata.gz: fe63a409aef358036b2c298c06de28e0a6916bfa283f02303b58d9fcab607af1
+  data.tar.gz: d2ab330b5ede162c6bbea6616b451608927535ce01ecd95dc532c415dc1bfa00
 SHA512:
-  metadata.gz: 51b48a2c02ee71e2d5d196c7d66a06a98c724690c38074ff84632e0025ab02b3465e981b385ebba9b5ae6f89f8641e9000a667cabc35e220ccd5983d18cbf5da
-  data.tar.gz: '0195409da11e513282a80e960a52b4df548bb2d843f376e5dea19d3783e4491e94c0cf6b36ff471c66b6fb789fe0deebca83063edbd7f67ae5aa4f91fa131135'
+  metadata.gz: 95c04bb572011f47a793f5c25529c99f742fb7d2b9c074c79f639b09dd259ea17ce3faa3485115e95049f5bf07e36a44ae8c5756cb00ae0befbc65d99fa572b9
+  data.tar.gz: f5a553b015a3fc000a401eb7cd6679dba463373e046d45bf60470ed60a9484faf1ca72e1ba80afd21900eac69e461b5f92539a130548e514032a0b74ee5103af

data/README.md

@@ -1,4 +1,4 @@
-# digest-kangarootwelve-ruby
+# digest-kangarootwelve
 
 The digest-kangarootwelve gem is an implementation of KangarooTwelve for Ruby
 that works on top of `Digest::Base`.
@@ -114,4 +114,5 @@ https://rubygems.org/gems/digest-kangarootwelve
 5. Create a new Pull Request.
 
 [![Build Status](https://travis-ci.org/konsolebox/digest-kangarootwelve-ruby.svg?branch=master)](https://travis-ci.org/konsolebox/digest-kangarootwelve-ruby)
-[![Build status](https://ci.appveyor.com/api/projects/status/bwedifhi4wa5wik7?svg=true)](https://ci.appveyor.com/project/konsolebox/digest-kangarootwelve-ruby)
+[![Build Status](https://ci.appveyor.com/api/projects/status/bwedifhi4wa5wik7?svg=true)](https://ci.appveyor.com/project/konsolebox/digest-kangarootwelve-ruby)
+[![Build Status](https://github.com/konsolebox/digest-kangarootwelve-ruby/actions/workflows/ruby.yml/badge.svg)](https://github.com/konsolebox/digest-kangarootwelve-ruby/actions/workflows/ruby.yml)

data/ext/digest/kangarootwelve/ext.c

@@ -71,6 +71,8 @@ typedef struct {
 #define KT_CONTEXT kangarootwelve_context_t
 #define KT_CONTEXT_PTR(void_ctx_ptr) ((KT_CONTEXT *) void_ctx_ptr)
 
+#define _RSTRING_PTR_U(x) (unsigned char *)RSTRING_PTR(x)
+
 static void check_digest_length(int digest_length)
 {
 	if (!(digest_length >= KT_MIN_DIGEST_LENGTH))
@@ -79,18 +81,24 @@ static void check_digest_length(int digest_length)
 
 static VALUE hex_encode_str(VALUE str)
 {
-	int len = RSTRING_LEN(str);
-	VALUE hex = rb_str_new(0, len * 2);
-	hex_encode_str_implied(RSTRING_PTR(str), len, RSTRING_PTR(hex));
+	int len;
+	VALUE hex;
+
+	len = RSTRING_LEN(str);
+	hex = rb_str_new(0, len * 2);
+	hex_encode_str_implied(_RSTRING_PTR_U(str), len, _RSTRING_PTR_U(hex));
 	return hex;
 }
 
 static VALUE hex_decode_str(VALUE str)
 {
-	int len = RSTRING_LEN(str);
-	VALUE decoded = rb_str_new(0, calc_hex_decoded_str_length(len));
+	int len;
+	VALUE decoded;
 
-	if (! hex_decode_str_implied(RSTRING_PTR(str), len, RSTRING_PTR(decoded))) {
+	len = RSTRING_LEN(str);
+	decoded = rb_str_new(0, calc_hex_decoded_str_length(len));
+
+	if (! hex_decode_str_implied(_RSTRING_PTR_U(str), len, _RSTRING_PTR_U(decoded))) {
 		VALUE inspect = rb_inspect(str);
 		rb_raise(rb_eArgError, "Failed to decode hex string %s.", RSTRING_PTR(inspect));
 	}
@@ -100,24 +108,26 @@ static VALUE hex_decode_str(VALUE str)
 
 static int kangarootwelve_init(void *ctx)
 {
+	VALUE klass_or_instance, digest_length, digest_length_int, customization;
+
 	if (ctx == NULL)
 		rb_raise(rb_eRuntimeError, "Context pointer is NULL.");
 
-	VALUE klass_or_instance = rb_current_receiver();
+	klass_or_instance = rb_current_receiver();
 
 	if (TYPE(klass_or_instance) == T_CLASS && klass_or_instance == _Digest_KangarooTwelve_Impl)
 		rb_raise(rb_eStandardError, "Digest::KangarooTwelve::Impl is a base class and cannot be instantiated.");
 
-	VALUE digest_length = rb_funcall(klass_or_instance, _id_digest_length, 0);
+	digest_length = rb_funcall(klass_or_instance, _id_digest_length, 0);
 
 	if (TYPE(digest_length) != T_FIXNUM)
 		rb_raise(rb_eTypeError, "Invalid object type for digest length.");
 
-	int digest_length_int = FIX2INT(digest_length);
+	digest_length_int = FIX2INT(digest_length);
 
 	check_digest_length(digest_length_int);
 
-	VALUE customization = rb_funcall(klass_or_instance, _id_customization, 0);
+	customization = rb_funcall(klass_or_instance, _id_customization, 0);
 
 	if (TYPE(customization) != T_NIL && TYPE(customization) != T_STRING)
 		rb_raise(rb_eTypeError, "Invalid object type for a customization string.");
@@ -144,17 +154,19 @@ static void kangarootwelve_update(void *ctx, unsigned char *data, size_t length)
 
 static int kangarootwelve_finish(void *ctx, unsigned char *data)
 {
+	VALUE customization;
+
 	if (ctx == NULL)
 		rb_raise(rb_eRuntimeError, "Context pointer is NULL.");
 
-	VALUE customization = KT_CONTEXT_PTR(ctx)->customization;
+	customization = KT_CONTEXT_PTR(ctx)->customization;
 
 	switch (TYPE(customization)) {
 	case T_NIL:
 		return KangarooTwelve_Final(&KT_CONTEXT_PTR(ctx)->instance, data, 0, 0) == 0;
 	case T_STRING:
-		return KangarooTwelve_Final(&KT_CONTEXT_PTR(ctx)->instance, data, RSTRING_PTR(customization),
-				RSTRING_LEN(customization)) == 0;
+		return KangarooTwelve_Final(&KT_CONTEXT_PTR(ctx)->instance, data,
+				_RSTRING_PTR_U(customization), RSTRING_LEN(customization)) == 0;
 	default:
 		rb_raise(rb_eRuntimeError, "Object type of customization string became invalid.");
 	}
@@ -162,11 +174,14 @@ static int kangarootwelve_finish(void *ctx, unsigned char *data)
 
 static VALUE implement(VALUE name, VALUE digest_length, VALUE customization)
 {
+	VALUE impl_class, impl_class_name, prev_digest_length, metadata_obj;
+	ID impl_class_name_id, id;
+	int digest_length_int, prev_digest_length_int;
+	rb_digest_metadata_t *metadata;
+
 	if (!KT_DIGEST_API_VERSION_IS_SUPPORTED(RUBY_DIGEST_API_VERSION))
 		rb_raise(rb_eRuntimeError, "Digest API version is not supported.");
 
-	int digest_length_int;
-
 	switch (TYPE(digest_length)) {
 	case T_NIL:
 		digest_length_int = KT_DEFAULT_DIGEST_LENGTH;
@@ -187,8 +202,7 @@ static VALUE implement(VALUE name, VALUE digest_length, VALUE customization)
 		rb_raise(rb_eTypeError, "Invalid value type for customization string.");
 	}
 
-	VALUE impl_class_name = Qnil;
-	ID impl_class_name_id, id;
+	impl_class_name = Qnil;
 
 	switch (TYPE(name)) {
 	case T_NIL:
@@ -223,8 +237,6 @@ static VALUE implement(VALUE name, VALUE digest_length, VALUE customization)
 		rb_raise(rb_eTypeError, "Invalid argument type for class name.");
 	}
 
-	VALUE impl_class;
-
 	if (impl_class_name == Qnil) {
 		impl_class = rb_funcall(rb_cClass, _id_new, 1, _Digest_KangarooTwelve_Impl);
 	} else {
@@ -243,7 +255,7 @@ static VALUE implement(VALUE name, VALUE digest_length, VALUE customization)
 						StringValueCStr(impl_class_name));
 			}
 
-			VALUE prev_digest_length = rb_ivar_get(impl_class, _id_digest_length);
+			prev_digest_length = rb_ivar_get(impl_class, _id_digest_length);
 
 			if (TYPE(prev_digest_length) != T_FIXNUM) {
 				rb_raise(rb_eRuntimeError,
@@ -251,7 +263,7 @@ static VALUE implement(VALUE name, VALUE digest_length, VALUE customization)
 						StringValueCStr(impl_class_name));
 			}
 
-			int prev_digest_length_int = FIX2INT(prev_digest_length);
+			prev_digest_length_int = FIX2INT(prev_digest_length);
 
 			if (prev_digest_length_int != digest_length_int) {
 				rb_raise(rb_eTypeError,
@@ -267,8 +279,6 @@ static VALUE implement(VALUE name, VALUE digest_length, VALUE customization)
 		impl_class = rb_define_class_id_under(_Digest, impl_class_name_id, _Digest_KangarooTwelve_Impl);
 	}
 
-	VALUE metadata_obj;
-	rb_digest_metadata_t *metadata;
 	metadata_obj = Data_Make_Struct(_Digest_KangarooTwelve_Metadata, rb_digest_metadata_t, 0, -1, metadata);
 
 	metadata->api_version = RUBY_DIGEST_API_VERSION;
@@ -560,17 +570,22 @@ static VALUE _Digest_KangarooTwelve_Impl_customization_hex(VALUE self)
  */
 static VALUE _Digest_KangarooTwelve_Impl_inspect(VALUE self)
 {
-	VALUE klass = rb_obj_class(self);
-	VALUE klass_name = rb_class_name(klass);
+	VALUE klass, klass_name, digest_length, customization_hex, hexdigest, args[4];
+
+	klass = rb_obj_class(self);
+	klass_name = rb_class_name(klass);
 
 	if (klass_name == Qnil)
 		klass_name = rb_inspect(klass);
 
-	VALUE digest_length = rb_funcall(self, _id_digest_length, 0);
-	VALUE customization_hex = rb_funcall(self, _id_customization_hex, 0);
-	VALUE hexdigest = rb_funcall(self, _id_hexdigest, 0);
+	digest_length = rb_funcall(self, _id_digest_length, 0);
+	customization_hex = rb_funcall(self, _id_customization_hex, 0);
+	hexdigest = rb_funcall(self, _id_hexdigest, 0);
 
-	VALUE args[] = { klass_name, digest_length, customization_hex, hexdigest };
+	args[0] = klass_name;
+	args[1] = digest_length;
+	args[2] = customization_hex;
+	args[3] = hexdigest;
 	return rb_str_format(sizeof(args), args, rb_str_new_literal("#<%s:%d|%s|%s>"));
 }
 

data/ext/digest/kangarootwelve/extconf.rb

@@ -11,4 +11,6 @@ common_dir = File.join(File.dirname(__FILE__), 'keccak', 'common')
 target_dir = File.join(File.dirname(__FILE__), 'keccak', target)
 find_header('align.h', common_dir)
 find_header('KeccakP-1600-SnP.h', target_dir)
+$defs.push('-Wall') if enable_config('all-warnings')
 create_makefile('digest/kangarootwelve', target_dir)
+File.write('Makefile', 'V = 1', mode: 'a') if enable_config('verbose-mode')

data/ext/digest/kangarootwelve/utils.h

@@ -34,8 +34,10 @@ static void hex_encode_str_implied(const unsigned char *src, size_t len, unsigne
  */
 static int hex_decode_str_implied(const unsigned char *src, size_t len, unsigned char *dest)
 {
+	unsigned char low, high;
+
 	if (len % 2) {
-		unsigned char low = *src++;
+		low = *src++;
 
 		if (low >= '0' && low <= '9') {
 			low -= '0';
@@ -52,7 +54,7 @@ static int hex_decode_str_implied(const unsigned char *src, size_t len, unsigned
 	}
 
 	for (; len > 0; len -= 2) {
-		unsigned char high = *src++;
+		high = *src++;
 
 		if (high >= '0' && high <= '9') {
 			high -= '0';
@@ -64,7 +66,7 @@ static int hex_decode_str_implied(const unsigned char *src, size_t len, unsigned
 			return 0;
 		}
 
-		unsigned char low = *src++;
+		low = *src++;
 
 		if (low >= '0' && low <= '9') {
 			low -= '0';

data/lib/digest/kangarootwelve/version.rb

@@ -1,5 +1,5 @@
 module Digest
   module KangarooTwelve
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

data/test/test.rb

@@ -22,48 +22,48 @@ end
 
 describe Digest::KangarooTwelve do
   it "produces implementation classes" do
-    Digest::KangarooTwelve[32].superclass.must_equal Digest::KangarooTwelve::Impl
-    Digest::KangarooTwelve[32].digest_length.must_equal 32
-    Digest::KangarooTwelve[32].must_equal Digest::KangarooTwelve_32
-    Digest::KangarooTwelve.implement(digest_length: 64).superclass.must_equal Digest::KangarooTwelve::Impl
-    Digest::KangarooTwelve.implement(digest_length: 64).digest_length.must_equal 64
-    Digest::KangarooTwelve.implement(digest_length: 64).must_equal Digest::KangarooTwelve_64
+    _(Digest::KangarooTwelve[32].superclass).must_equal Digest::KangarooTwelve::Impl
+    _(Digest::KangarooTwelve[32].digest_length).must_equal 32
+    _(Digest::KangarooTwelve[32]).must_equal Digest::KangarooTwelve_32
+    _(Digest::KangarooTwelve.implement(digest_length: 64).superclass).must_equal Digest::KangarooTwelve::Impl
+    _(Digest::KangarooTwelve.implement(digest_length: 64).digest_length).must_equal 64
+    _(Digest::KangarooTwelve.implement(digest_length: 64)).must_equal Digest::KangarooTwelve_64
   end
 
   it "produces a default implemention with a digest length of 64" do
-    Digest::KangarooTwelve.implement.must_equal Digest::KangarooTwelve_64
-    Digest::KangarooTwelve_64.digest_length.must_equal 64
+    _(Digest::KangarooTwelve.implement).must_equal Digest::KangarooTwelve_64
+    _(Digest::KangarooTwelve_64.digest_length).must_equal 64
   end
 
   it "produces instances that are consistent with produced implementation classes" do
-    Digest::KangarooTwelve[32].new.class.must_equal Digest::KangarooTwelve_32
-    Digest::KangarooTwelve.implement(digest_length: 48).must_equal Digest::KangarooTwelve_48
+    _(Digest::KangarooTwelve[32].new.class).must_equal Digest::KangarooTwelve_32
+    _(Digest::KangarooTwelve.implement(digest_length: 48)).must_equal Digest::KangarooTwelve_48
   end
 
   it "produces classes with equal digest length as its instances" do
-    Digest::KangarooTwelve[32].new.digest_length.must_equal Digest::KangarooTwelve_32.digest_length
-    Digest::KangarooTwelve.implement(digest_length: 48).new.digest_length.must_equal Digest::KangarooTwelve_48.digest_length
+    _(Digest::KangarooTwelve[32].new.digest_length).must_equal Digest::KangarooTwelve_32.digest_length
+    _(Digest::KangarooTwelve.implement(digest_length: 48).new.digest_length).must_equal Digest::KangarooTwelve_48.digest_length
   end
 
   it "produces hashes" do
-    Digest::KangarooTwelve.default.digest("").class.must_equal String
-    Digest::KangarooTwelve.default.hexdigest("").class.must_equal String
-    Digest::KangarooTwelve.default.new.digest("").class.must_equal String
-    Digest::KangarooTwelve.default.new.hexdigest("").class.must_equal String
+    _(Digest::KangarooTwelve.default.digest("").class).must_equal String
+    _(Digest::KangarooTwelve.default.hexdigest("").class).must_equal String
+    _(Digest::KangarooTwelve.default.new.digest("").class).must_equal String
+    _(Digest::KangarooTwelve.default.new.hexdigest("").class).must_equal String
   end
 
   it "produces similar output with its digest and hexdigest methods" do
     digest_a = Digest::KangarooTwelve[32].digest("abcd")
-    digest_a.class.must_equal String
+    _(digest_a.class).must_equal String
     digest_b = Digest::KangarooTwelve[32].new.digest("abcd")
-    digest_b.class.must_equal String
-    digest_a.must_equal digest_b
+    _(digest_b.class).must_equal String
+    _(digest_a).must_equal digest_b
     hex_digest_a = Digest::KangarooTwelve[32].hexdigest("abcd")
-    hex_digest_a.class.must_equal String
+    _(hex_digest_a.class).must_equal String
     hex_digest_b = Digest::KangarooTwelve[32].new.hexdigest("abcd")
-    hex_digest_b.class.must_equal String
-    hex_digest_a.must_equal hex_digest_b
-    hex_digest_a.must_equal hex_encode(digest_a)
+    _(hex_digest_b.class).must_equal String
+    _(hex_digest_a).must_equal hex_digest_b
+    _(hex_digest_a).must_equal hex_encode(digest_a)
   end
 
   it "works with customization strings" do
@@ -75,38 +75,38 @@ describe Digest::KangarooTwelve do
     b = Digest::KangarooTwelve.implement(name: "KangarooTwelveTestB", digest_length: 48, customization: "abcd")
     c = Digest::KangarooTwelve.implement(name: "KangarooTwelveTestC", digest_length: 48, customization_hex: "61626364")
     d = Digest::KangarooTwelve.implement(name: "KangarooTwelveTestD", digest_length: 48, ch: "61626364")
-    a.name.must_equal "Digest::KangarooTwelveTestA"
-    b.name.must_equal "Digest::KangarooTwelveTestB"
-    a.digest_length.must_equal 48
-    b.digest_length.must_equal a.digest_length
-    a.customization.must_equal "abcd"
-    b.customization.must_equal a.customization
-    c.customization.must_equal a.customization
-    d.customization.must_equal a.customization
+    _(a.name).must_equal "Digest::KangarooTwelveTestA"
+    _(b.name).must_equal "Digest::KangarooTwelveTestB"
+    _(a.digest_length).must_equal 48
+    _(b.digest_length).must_equal a.digest_length
+    _(a.customization).must_equal "abcd"
+    _(b.customization).must_equal a.customization
+    _(c.customization).must_equal a.customization
+    _(d.customization).must_equal a.customization
   end
 
   it "has a customization method that returns nil when customization string is undefined" do
-    Digest::KangarooTwelve.implement.customization.must_be_nil
+    _(Digest::KangarooTwelve.implement.customization).must_be_nil
   end
 
   it "has a customization_hex method that returns hex of customization string, or nil" do
-    Digest::KangarooTwelve.implement(c: "abcd").customization_hex.must_equal "61626364"
-    Digest::KangarooTwelve.implement.customization_hex.must_be_nil
+    _(Digest::KangarooTwelve.implement(c: "abcd").customization_hex).must_equal "61626364"
+    _(Digest::KangarooTwelve.implement.customization_hex).must_be_nil
   end
 
   it "has a declared block length of 8192 bytes" do
-    Digest::KangarooTwelve::BLOCK_LENGTH.must_equal 8192
-    Digest::KangarooTwelve.default.block_length.must_equal 8192
-    Digest::KangarooTwelve.default.new.block_length.must_equal 8192
+    _(Digest::KangarooTwelve::BLOCK_LENGTH).must_equal 8192
+    _(Digest::KangarooTwelve.default.block_length).must_equal 8192
+    _(Digest::KangarooTwelve.default.new.block_length).must_equal 8192
   end
 
   it "produces valid hashes" do
     # KangarooTwelve(M=empty, C=empty, 32 bytes):
-    Digest::KangarooTwelve[32].new.hexdigest("").must_equal "1ac2d450fc3b4205d19da7bfca1b37513c0803577ac7167f06fe2ce1f0ef39e5"
+    _(Digest::KangarooTwelve[32].new.hexdigest("")).must_equal "1ac2d450fc3b4205d19da7bfca1b37513c0803577ac7167f06fe2ce1f0ef39e5"
     # KangarooTwelve(M=empty, C=empty, 64 bytes):
-    Digest::KangarooTwelve[64].new.hexdigest("").must_equal "1ac2d450fc3b4205d19da7bfca1b37513c0803577ac7167f06fe2ce1f0ef39e54269c056b8c82e48276038b6d292966cc07a3d4645272e31ff38508139eb0a71"
+    _(Digest::KangarooTwelve[64].new.hexdigest("")).must_equal "1ac2d450fc3b4205d19da7bfca1b37513c0803577ac7167f06fe2ce1f0ef39e54269c056b8c82e48276038b6d292966cc07a3d4645272e31ff38508139eb0a71"
     # KangarooTwelve(M=empty, C=empty, 10032 bytes), last 32 bytes:
-    Digest::KangarooTwelve[10032].new.hexdigest("")[-64..-1].must_equal "e8dc563642f7228c84684c898405d3a834799158c079b12880277a1d28e2ff6d"
+    _(Digest::KangarooTwelve[10032].new.hexdigest("")[-64..-1]).must_equal "e8dc563642f7228c84684c898405d3a834799158c079b12880277a1d28e2ff6d"
 
     # KangarooTwelve(M=pattern 0x00 to 0xFA for 17^i bytes, C=empty, 32 bytes):
     [
@@ -119,7 +119,7 @@ describe Digest::KangarooTwelve do
       [6, "3c390782a8a4e89fa6367f72feaaf13255c8d95878481d3cd8ce85f58e880af8"]
     ].each do |i, hash|
       m = get_repeated_0x00_to_0xfa(17 ** i)
-      Digest::KangarooTwelve[32].new.hexdigest(m).must_equal hash
+      _(Digest::KangarooTwelve[32].new.hexdigest(m)).must_equal hash
     end
   end
 
@@ -133,7 +133,7 @@ describe Digest::KangarooTwelve do
     ].each do |i, j, hash|
       m = get_repeated_0xff(i)
       c = get_repeated_0x00_to_0xfa(41 ** j)
-      Digest::KangarooTwelve.implement(digest_length: 32, customization: c).new.hexdigest(m).must_equal hash
+      _(Digest::KangarooTwelve.implement(digest_length: 32, customization: c).new.hexdigest(m)).must_equal hash
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: digest-kangarootwelve
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - konsolebox
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -371,7 +371,7 @@ homepage: https://github.com/konsolebox/digest-kangarootwelve-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -386,9 +386,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubygems_version: 3.2.14
+signing_key:
 specification_version: 4
 summary: KangarooTwelve for Ruby
 test_files: