digest 3.1.0.pre3 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a901be021123562b80812ad783e1e6cb9d44a3d3082b38304860722b1de65b8d
-  data.tar.gz: d22dfd3515b87aa626b52a096240fab8ebe635eb0ee43edc1ce595c6ae6901a8
+  metadata.gz: 987de45a2894fa80f0d6ff23f3a70a7e813b9529b5ef4130b22be5e4c2f78020
+  data.tar.gz: 7241f2a350845b1478666dfbb0d6662a1b61e41a16e7504b064dd6eca6e3c0b2
 SHA512:
-  metadata.gz: 4f06a8c82073b0ae69a6f6a0292a92bcca0e13af7f751cc98471769c71efcd5f5cd2cfa45ad9b3b7d1b574b7ce7b442ee85f75391de1376f9180499dd682c002
-  data.tar.gz: 3a53dbbcd44edacf5ea23a326a27474715693ea6064d9ed5211790fcf2af12669a9115219cf8cd83bda99d5a0c4790bd9d7a9062b4b3f29de0e4b3c2bc15f16d
+  metadata.gz: b1f322b8fed96de4cde9b2b8cd2997f99a80998b5b671924cb6f3e3b6b28215c95021f2919ef8a5176823639e56ddb3cd05e2a154c59d9945f4770138ae4d941
+  data.tar.gz: f2a9f6d45f28fe9be2d140d9f99147669f9a0ab32fbeac724254eca036a89a364f222beac6eb3b38def4f395f961dc646a7780344e7eb13eff0759a39b7c6ce7

data/ext/digest/bubblebabble/bubblebabble.c

@@ -37,7 +37,7 @@ bubblebabble_str_new(VALUE str_digest)
     digest_len = RSTRING_LEN(str_digest);
 
     if ((LONG_MAX - 2) / 3 < (digest_len | 1)) {
-	rb_raise(rb_eRuntimeError, "digest string too long");
+        rb_raise(rb_eRuntimeError, "digest string too long");
     }
 
     str = rb_str_new(0, (digest_len | 1) * 3 + 2);

data/ext/digest/digest.c

@@ -154,7 +154,7 @@ static void
 rb_digest_instance_method_unimpl(VALUE self, const char *method)
 {
     rb_raise(rb_eRuntimeError, "%s does not implement %s()",
-	     rb_obj_classname(self), method);
+             rb_obj_classname(self), method);
 }
 
 /*
@@ -383,8 +383,8 @@ rb_digest_instance_equal(VALUE self, VALUE other)
     StringValue(str2);
 
     if (RSTRING_LEN(str1) == RSTRING_LEN(str2) &&
-	rb_str_cmp(str1, str2) == 0) {
-	return Qtrue;
+        rb_str_cmp(str1, str2) == 0) {
+        return Qtrue;
     }
     return Qfalse;
 }
@@ -602,7 +602,7 @@ static inline void
 algo_init(const rb_digest_metadata_t *algo, void *pctx)
 {
     if (algo->init_func(pctx) != 1) {
-	rb_raise(rb_eRuntimeError, "Digest initialization failed.");
+        rb_raise(rb_eRuntimeError, "Digest initialization failed.");
     }
 }
 
@@ -614,7 +614,7 @@ rb_digest_base_alloc(VALUE klass)
     void *pctx;
 
     if (klass == rb_cDigest_Base) {
-	rb_raise(rb_eNotImpError, "Digest::Base is an abstract class");
+        rb_raise(rb_eNotImpError, "Digest::Base is an abstract class");
     }
 
     algo = get_digest_base_metadata(klass);
@@ -639,7 +639,7 @@ rb_digest_base_copy(VALUE copy, VALUE obj)
 
     algo = get_digest_obj_metadata(copy);
     if (algo != get_digest_obj_metadata(obj))
-	rb_raise(rb_eTypeError, "different algorithms");
+        rb_raise(rb_eTypeError, "different algorithms");
 
     TypedData_Get_Struct(obj, void, &digest_type, pctx1);
     TypedData_Get_Struct(copy, void, &digest_type, pctx2);

data/ext/digest/digest.h

@@ -38,7 +38,7 @@ rb_digest_##name##_update(void *ctx, unsigned char *ptr, size_t size) \
     const unsigned int stride = 16384; \
  \
     for (; size > stride; size -= stride, ptr += stride) { \
-	name##_Update(ctx, ptr, stride); \
+        name##_Update(ctx, ptr, stride); \
     } \
     if (size > 0) name##_Update(ctx, ptr, size); \
 }

data/ext/digest/digest_conf.rb

@@ -3,7 +3,7 @@
 def digest_conf(name)
   unless with_config("bundled-#{name}")
     cc = with_config("common-digest")
-    if cc == true or /\b#{name}\b/ =~ cc
+    if cc != false or /\b#{name}\b/ =~ cc
       if File.exist?("#$srcdir/#{name}cc.h") and
         have_header("CommonCrypto/CommonDigest.h")
         $defs << "-D#{name.upcase}_USE_COMMONDIGEST"

data/ext/digest/extconf.rb

@@ -4,4 +4,8 @@
 
 require "mkmf"
 
+$INSTALLFILES = {
+  "digest.h" => "$(HDRDIR)"
+} if $extmk
+
 create_makefile("digest")

data/ext/digest/sha2/sha2.c

@@ -128,7 +128,7 @@ typedef u_int64_t sha2_word64;	/* Exactly 8 bytes */
 #define SHA512_SHORT_BLOCK_LENGTH	(SHA512_BLOCK_LENGTH - 16)
 
 
-#if (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || defined(__GNUC__) || defined(_HPUX_SOURCE) || defined(__IBMC__)
+#if (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || defined(__GNUC__) || defined(__IBMC__)
 #define ULL(number)	number##ULL
 #else
 #define ULL(number)	(uint64_t)(number)

data/ext/digest/sha2/sha2init.c

@@ -47,7 +47,7 @@ Init_sha2(void)
     cDigest_SHA##bitlen = rb_define_class_under(mDigest, "SHA" #bitlen, cDigest_Base); \
 \
     rb_ivar_set(cDigest_SHA##bitlen, id_metadata, \
-		rb_digest_make_metadata(&sha##bitlen));
+                rb_digest_make_metadata(&sha##bitlen));
 
     FOREACH_BITLEN(DEFINE_ALGO_CLASS)
 }

data/lib/digest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Digest
-  VERSION = "3.1.0.pre3"
+  VERSION = "3.1.1"
 end

data/lib/digest.rb

@@ -1,25 +1,23 @@
 # frozen_string_literal: false
 
-# The gem and bundle commands (except for bundle exec) first load
-# digest via openssl and then load gems, so if this is installed via
-# gem, we are overwriting the default version of digest.  Beware not
-# to break it or cause redefinition warnings.
-#
-# When we introduce incompatible changes and overwriting is not an
-# option, and given that the default version does not have security
-# defects, we may just give up and let those commands just use the
-# default version of digest.
-#
-# return if defined?(Digest) && caller_locations.any? { |l|
-#   %r{/(rubygems/gem_runner|bundler/cli)\.rb}.match?(l.path)
-# }
+if defined?(Digest) &&
+    /\A(?:2\.|3\.0\.[0-2]\z)/.match?(RUBY_VERSION) &&
+    caller_locations.any? { |l|
+      %r{/(rubygems/gem_runner|bundler/cli)\.rb}.match?(l.path)
+    }
+  # Before Ruby 3.0.3/3.1.0, the gem and bundle commands used to load
+  # the digest library before loading additionally installed gems, so
+  # you will get constant redefinition warnings and unexpected
+  # implementation overwriting if we proceed here.  Avoid that.
+  return
+end
 
 require 'digest/version'
 require 'digest/loader'
 
 module Digest
   # A mutex for Digest().
-  REQUIRE_MUTEX ||= Thread::Mutex.new
+  REQUIRE_MUTEX = Thread::Mutex.new
 
   def self.const_missing(name) # :nodoc:
     case name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: digest
 version: !ruby/object:Gem::Version
-  version: 3.1.0.pre3
+  version: 3.1.1
 platform: ruby
 authors:
 - Akinori MUSHA
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-24 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies: []
 description: Provides a framework for message digest libraries.
 email:
@@ -28,12 +28,10 @@ files:
 - ext/digest/bubblebabble/bubblebabble.c
 - ext/digest/bubblebabble/extconf.rb
 - ext/digest/defs.h
-- ext/digest/depend
 - ext/digest/digest.c
 - ext/digest/digest.h
 - ext/digest/digest_conf.rb
 - ext/digest/extconf.rb
-- ext/digest/install_headers.rb
 - ext/digest/lib/digest/loader.rb
 - ext/digest/lib/digest/sha2/loader.rb
 - ext/digest/md5/extconf.rb
@@ -76,11 +74,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: Provides a framework for message digest libraries.

data/ext/digest/depend

@@ -1,3 +0,0 @@
-do-install-rb: do-install-headers
-do-install-headers:
-	$(Q) $(RUBY) install_headers.rb $(srcdir)/digest.h $(DESTDIR)$(HDRDIR)

data/ext/digest/install_headers.rb

@@ -1,13 +0,0 @@
-require "fileutils"
-
-*files, dest = ARGV
-
-if File.exist?(File.join(dest, "ruby.h"))
-  warn "installing header files"
-
-  files.each { |file|
-    FileUtils.install file, dest, mode: 0644, verbose: true
-  }
-else
-  warn "not installing header files when installed as an external library"
-end