digest 3.0.0 → 3.1.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca0a4032ec35dc7d0948a072263772ccb40fec3d5244a693bdca359641d88a53
-  data.tar.gz: 5ac7e173aabf71b6154168c34b3d630ca531a10233451f5ab9e7d9112cf5d889
+  metadata.gz: a901be021123562b80812ad783e1e6cb9d44a3d3082b38304860722b1de65b8d
+  data.tar.gz: d22dfd3515b87aa626b52a096240fab8ebe635eb0ee43edc1ce595c6ae6901a8
 SHA512:
-  metadata.gz: 64ff7f9e99ae227bc21477c909485128d4a45ab6a183a8984fb227de8f83d3380b9e80f695f3d59614d0a7f0bc7dff4226ba68ac9905d4631f79e34e68c6fe88
-  data.tar.gz: ff8b0a0e1193e9507f7c53757e005fbe1de229c2c09cdcb54299afef88e050057a66cd597e3c3e1ad7c17967a07d33a7b1ad14fd9245ef9d51d3db9286589d42
+  metadata.gz: 4f06a8c82073b0ae69a6f6a0292a92bcca0e13af7f751cc98471769c71efcd5f5cd2cfa45ad9b3b7d1b574b7ce7b442ee85f75391de1376f9180499dd682c002
+  data.tar.gz: 3a53dbbcd44edacf5ea23a326a27474715693ea6064d9ed5211790fcf2af12669a9115219cf8cd83bda99d5a0c4790bd9d7a9062b4b3f29de0e4b3c2bc15f16d

data/ext/digest/bubblebabble/extconf.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: false
 require 'mkmf'
 
-$defs << "-DHAVE_CONFIG_H"
-
 create_makefile('digest/bubblebabble')

data/ext/digest/depend

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

data/ext/digest/extconf.rb

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

data/ext/digest/install_headers.rb

@@ -0,0 +1,13 @@
+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

data/ext/digest/lib/digest/loader.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require 'digest.so'

data/ext/digest/lib/digest/sha2/loader.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require 'digest/sha2.so'

data/ext/digest/md5/extconf.rb

@@ -6,8 +6,6 @@
 require "mkmf"
 require File.expand_path("../../digest_conf", __FILE__)
 
-$defs << "-DHAVE_CONFIG_H"
-
 $objs = [ "md5init.#{$OBJEXT}" ]
 
 digest_conf("md5")

data/ext/digest/md5/md5.c

@@ -225,7 +225,7 @@ md5_process(MD5_CTX *pms, const uint8_t *data /*[64]*/)
     uint32_t xbuf[16];
     const uint32_t *X;
 
-    if (!((data - (const uint8_t *)0) & 3)) {
+    if (!(((uintptr_t)data) & 3)) {
 	/* data are properly aligned */
 	X = (const uint32_t *)data;
     } else {

data/ext/digest/rmd160/extconf.rb

@@ -6,7 +6,9 @@
 require "mkmf"
 require File.expand_path("../../digest_conf", __FILE__)
 
-$defs << "-DNDEBUG" << "-DHAVE_CONFIG_H"
+if try_static_assert("RUBY_API_VERSION_MAJOR < 3", "ruby/version.h")
+  $defs << "-DNDEBUG"
+end
 
 $objs = [ "rmd160init.#{$OBJEXT}" ]
 

data/ext/digest/sha1/extconf.rb

@@ -6,8 +6,6 @@
 require "mkmf"
 require File.expand_path("../../digest_conf", __FILE__)
 
-$defs << "-DHAVE_CONFIG_H"
-
 $objs = [ "sha1init.#{$OBJEXT}" ]
 
 digest_conf("sha1")

data/ext/digest/sha2/extconf.rb

@@ -6,8 +6,6 @@
 require "mkmf"
 require File.expand_path("../../digest_conf", __FILE__)
 
-$defs << "-DHAVE_CONFIG_H"
-
 $objs = [ "sha2init.#{$OBJEXT}" ]
 
 unless digest_conf("sha2")

data/ext/digest/sha2/sha2.c

@@ -94,7 +94,7 @@
 
 /*
  * Define the followingsha2_* types to types of the correct length on
- * the native archtecture.   Most BSD systems and Linux define u_intXX_t
+ * the native architecture.  Most BSD systems and Linux define u_intXX_t
  * types.  Machines with very recent ANSI C headers, can use the
  * uintXX_t definintions from inttypes.h by defining SHA2_USE_INTTYPES_H
  * during compile or in the sha.h header file.
@@ -575,7 +575,7 @@ void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
 	usedspace = freespace = 0;
 }
 
-int SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
+int SHA256_Final(sha2_byte digest[SHA256_DIGEST_LENGTH], SHA256_CTX* context) {
 	sha2_word32	*d = (sha2_word32*)digest;
 	unsigned int	usedspace;
 
@@ -640,7 +640,7 @@ int SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
 	return 1;
 }
 
-char *SHA256_End(SHA256_CTX* context, char buffer[]) {
+char *SHA256_End(SHA256_CTX* context, char buffer[SHA256_DIGEST_STRING_LENGTH]) {
 	sha2_byte	digest[SHA256_DIGEST_LENGTH], *d = digest;
 	int		i;
 
@@ -943,7 +943,7 @@ void SHA512_Last(SHA512_CTX* context) {
 	SHA512_Transform(context, (sha2_word64*)context->buffer);
 }
 
-int SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
+int SHA512_Final(sha2_byte digest[SHA512_DIGEST_LENGTH], SHA512_CTX* context) {
 	sha2_word64	*d = (sha2_word64*)digest;
 
 	/* Sanity check: */
@@ -973,7 +973,7 @@ int SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
 	return 1;
 }
 
-char *SHA512_End(SHA512_CTX* context, char buffer[]) {
+char *SHA512_End(SHA512_CTX* context, char buffer[SHA512_DIGEST_STRING_LENGTH]) {
 	sha2_byte	digest[SHA512_DIGEST_LENGTH], *d = digest;
 	int		i;
 
@@ -1019,7 +1019,7 @@ void SHA384_Update(SHA384_CTX* context, const sha2_byte* data, size_t len) {
 	SHA512_Update((SHA512_CTX*)context, data, len);
 }
 
-int SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
+int SHA384_Final(sha2_byte digest[SHA384_DIGEST_LENGTH], SHA384_CTX* context) {
 	sha2_word64	*d = (sha2_word64*)digest;
 
 	/* Sanity check: */
@@ -1049,7 +1049,7 @@ int SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
 	return 1;
 }
 
-char *SHA384_End(SHA384_CTX* context, char buffer[]) {
+char *SHA384_End(SHA384_CTX* context, char buffer[SHA384_DIGEST_STRING_LENGTH]) {
 	sha2_byte	digest[SHA384_DIGEST_LENGTH], *d = digest;
 	int		i;
 

data/{ext/digest/sha2/lib → lib/digest}/sha2.rb

@@ -11,7 +11,7 @@
 #   $Id$
 
 require 'digest'
-require 'digest/sha2.so'
+require 'digest/sha2/loader'
 
 module Digest
   #

data/lib/digest/version.rb

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

data/lib/digest.rb

@@ -1,14 +1,30 @@
 # frozen_string_literal: false
-require 'digest.so'
+
+# 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)
+# }
+
+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
     when :SHA256, :SHA384, :SHA512
-      lib = 'digest/sha2.so'
+      lib = 'digest/sha2'
     else
       lib = File.join('digest', name.to_s.downcase)
     end

metadata

@@ -1,84 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: digest
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0.pre3
 platform: ruby
 authors:
 - Akinori MUSHA
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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: 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: rake-compiler
-  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'
+date: 2021-10-24 00:00:00.000000000 Z
+dependencies: []
 description: Provides a framework for message digest libraries.
 email:
 - knu@idaemons.org
 executables: []
 extensions:
-- ext/digest/extconf.rb
 - ext/digest/bubblebabble/extconf.rb
+- ext/digest/extconf.rb
 - ext/digest/md5/extconf.rb
 - ext/digest/rmd160/extconf.rb
 - ext/digest/sha1/extconf.rb
 - ext/digest/sha2/extconf.rb
 extra_rdoc_files: []
 files:
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
-- digest.gemspec
 - 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
 - ext/digest/md5/md5.c
 - ext/digest/md5/md5.h
@@ -94,21 +51,21 @@ files:
 - ext/digest/sha1/sha1cc.h
 - ext/digest/sha1/sha1init.c
 - ext/digest/sha2/extconf.rb
-- ext/digest/sha2/lib/sha2.rb
 - ext/digest/sha2/sha2.c
 - ext/digest/sha2/sha2.h
 - ext/digest/sha2/sha2cc.h
 - ext/digest/sha2/sha2init.c
 - ext/digest/test.sh
-- ext/openssl/deprecation.rb
 - lib/digest.rb
+- lib/digest/sha2.rb
+- lib/digest/version.rb
 homepage: https://github.com/ruby/digest
 licenses:
 - Ruby
 - BSD-2-Clause
 metadata:
   msys2_mingw_dependencies: openssl
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,15 +73,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.2
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Provides a framework for message digest libraries.
 test_files: []

data/Gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in digest.gemspec
-gemspec

data/Rakefile

@@ -1,15 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  ENV["RUBYOPT"] = "-Itest -Itest/lib -Ilib"
-  t.test_files = FileList["test/**/test_*.rb"]
-end
-
-require 'rake/extensiontask'
-Rake::ExtensionTask.new("digest")
-%w(bubblebabble md5 rmd160 sha1 sha2).each do |ext|
-  Rake::ExtensionTask.new("digest/#{ext}")
-end
-
-task :default => :test

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "digest"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/digest.gemspec

@@ -1,47 +0,0 @@
-# coding: utf-8
-# frozen_string_literal: true
-
-Gem::Specification.new do |spec|
-  spec.name          = "digest"
-  spec.version       = "3.0.0"
-  spec.authors       = ["Akinori MUSHA"]
-  spec.email         = ["knu@idaemons.org"]
-
-  spec.summary       = %q{Provides a framework for message digest libraries.}
-  spec.description   = %q{Provides a framework for message digest libraries.}
-  spec.homepage      = "https://github.com/ruby/digest"
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
-
-  spec.files         = [
-    "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "digest.gemspec",
-    "ext/digest/bubblebabble/bubblebabble.c", "ext/digest/bubblebabble/extconf.rb", "ext/digest/defs.h",
-    "ext/digest/digest.c", "ext/digest/digest.h", "ext/digest/digest_conf.rb", "ext/digest/extconf.rb",
-    "ext/digest/md5/extconf.rb", "ext/digest/md5/md5.c", "ext/digest/md5/md5.h", "ext/digest/md5/md5cc.h",
-    "ext/digest/md5/md5init.c", "ext/digest/rmd160/extconf.rb", "ext/digest/rmd160/rmd160.c",
-    "ext/digest/rmd160/rmd160.h", "ext/digest/rmd160/rmd160init.c", "ext/digest/sha1/extconf.rb",
-    "ext/digest/sha1/sha1.c", "ext/digest/sha1/sha1.h", "ext/digest/sha1/sha1cc.h",
-    "ext/digest/sha1/sha1init.c", "ext/digest/sha2/extconf.rb", "ext/digest/sha2/lib/sha2.rb",
-    "ext/digest/sha2/sha2.c", "ext/digest/sha2/sha2.h", "ext/digest/sha2/sha2cc.h",
-    "ext/digest/sha2/sha2init.c", "ext/digest/test.sh", "ext/openssl/deprecation.rb",
-    "lib/digest.rb"
-  ]
-
-  spec.required_ruby_version = ">= 2.3.0"
-
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-  spec.extensions    = %w[
-    ext/digest/extconf.rb
-    ext/digest/bubblebabble/extconf.rb
-    ext/digest/md5/extconf.rb
-    ext/digest/rmd160/extconf.rb
-    ext/digest/sha1/extconf.rb
-    ext/digest/sha2/extconf.rb
-  ]
-  spec.metadata["msys2_mingw_dependencies"] = "openssl"
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rake-compiler"
-end

data/ext/openssl/deprecation.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: false
-module OpenSSL
-  def self.deprecated_warning_flag
-    unless flag = (@deprecated_warning_flag ||= nil)
-      if try_compile("", flag = "-Werror=deprecated-declarations")
-        $warnflags << " #{flag}"
-      else
-        flag = ""
-      end
-      @deprecated_warning_flag = flag
-    end
-    flag
-  end
-
-  def self.check_func(func, header)
-    have_func(func, header, deprecated_warning_flag)
-  end
-
-  def self.check_func_or_macro(func, header)
-    check_func(func, header) or
-      have_macro(func, header) && $defs.push("-DHAVE_#{func.upcase}")
-  end
-end