digest 3.2.1-java → 3.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd920ad0b031fd02eef7dcd794262cfe46036609989fc22b62879eb29d39658a
-  data.tar.gz: f3e4d408d42eaf8a2a55070f3999d4224d49e17ce60cb5ab2dfafd7432b04c25
+  metadata.gz: 38a4e6158ff60fed79aee97551d7a1d59e51ed04b924a1a722c459663dee8807
+  data.tar.gz: b7b5775a2e636c8b3c9412b41308c87fe016d8099cb481724c06bc091bec9e94
 SHA512:
-  metadata.gz: 1f3fe160be2cc1707c393433cb763faba5ed751e8a300c59997756fec3f6ee8883147911e8f957e8b1b6f08919ab98b52c86b1e245ab5ebc1d24d06160535c7b
-  data.tar.gz: ab27ad07eaeeb2734bac974b33e8bff20f621d452320aa7b009a1c2553a4349c342cc5c70453cc0c0aa92b2b6b92c843263e306b85647b9ce890b30dccd93dfc
+  metadata.gz: d27a3d5a2bc2a2daf1ea25fca62461c0b172d3042dd65a447331357f8c975471826e470d30ed1bac99e463df30100ccf691796c508599d42c547171e81ca3437
+  data.tar.gz: 8e154a83b2b2d5c8e60ef26ec4e2b56d7de4ef437c8e11f35e1a3ae93aa26f819085e3907f708d2c4ff802506c431693d65913f40452d5edf3a825e62133ec51

data/README.md

@@ -1,6 +1,6 @@
 # Digest
 
-![CI](https://github.com/ruby/digest/workflows/CI/badge.svg?branch=master&event=push)
+[![CI](https://github.com/ruby/digest/actions/workflows/ci.yml/badge.svg?branch=master&event=push)](https://github.com/ruby/digest/actions/workflows/ci.yml)
 
 This module provides a framework for message digest libraries.
 
@@ -78,6 +78,9 @@ SHA2 family::
  SHA512
  SHA384
  SHA256
+BLAKE3::
+  As Digest::BLAKE3, producing a 256-bit digest.
+  See https://github.com/BLAKE3-team/BLAKE3.
 ```
 
 The latest versions of the FIPS publications can be found here: http://csrc.nist.gov/publications/PubsFIPS.html.

data/ext/java/org/jruby/ext/digest/CRC32.java

@@ -0,0 +1,127 @@
+/*
+ **** BEGIN LICENSE BLOCK *****
+ * BSD 2-Clause License
+ *
+ * Copyright (c) 2026, Olle Jonsson
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ***** END LICENSE BLOCK *****/
+
+package org.jruby.ext.digest;
+
+import java.io.IOException;
+
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyFixnum;
+import org.jruby.RubyModule;
+import org.jruby.RubyObject;
+import org.jruby.RubyString;
+import org.jruby.anno.JRubyClass;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.api.Access;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.Visibility;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.runtime.load.Library;
+import org.jruby.util.ByteList;
+
+public class CRC32 implements Library {
+
+    public void load(final Ruby runtime, boolean wrap) throws IOException {
+        runtime.getLoadService().require("digest");
+        ThreadContext context = runtime.getCurrentContext();
+        RubyModule Digest = Access.getModule(context, "Digest");
+        RubyClass Base = Digest.getClass(context, "Base");
+        RubyClass crc32 = Digest.defineClassUnder(context, "CRC32", Base, DigestCRC32::new);
+        crc32.defineMethods(context, DigestCRC32.class);
+    }
+
+    private static final class CloneableCRC32 extends java.util.zip.CRC32 implements Cloneable {
+        @Override
+        public CloneableCRC32 clone() throws CloneNotSupportedException {
+            return (CloneableCRC32) super.clone();
+        }
+    }
+
+    @JRubyClass(name="Digest::CRC32", parent="Digest::Base")
+    public static class DigestCRC32 extends RubyObject {
+        private static final long serialVersionUID = -2811470471354871234L;
+
+        private transient CloneableCRC32 crc = new CloneableCRC32();
+
+        public DigestCRC32(Ruby runtime, RubyClass type) {
+            super(runtime, type);
+        }
+
+        @JRubyMethod(required = 1, visibility = Visibility.PRIVATE)
+        @Override
+        public IRubyObject initialize_copy(ThreadContext context, IRubyObject obj) {
+            if (this == obj) return this;
+            DigestCRC32 from = (DigestCRC32) obj;
+            this.checkFrozen();
+            try {
+                this.crc = from.crc.clone();
+            } catch (CloneNotSupportedException e) {
+                throw getRuntime().newRaiseException(getRuntime().getTypeError(), "Could not initialize copy of Digest::CRC32");
+            }
+            return this;
+        }
+
+        @JRubyMethod(name = {"update", "<<"}, required = 1)
+        public IRubyObject update(IRubyObject obj) {
+            ByteList bytes = obj.convertToString().getByteList();
+            crc.update(bytes.getUnsafeBytes(), bytes.getBegin(), bytes.getRealSize());
+            return this;
+        }
+
+        @JRubyMethod()
+        public IRubyObject finish() {
+            long val = crc.getValue();
+            crc.reset();
+            byte[] digest = new byte[] {
+                (byte)(val >>> 24),
+                (byte)(val >>> 16),
+                (byte)(val >>> 8),
+                (byte) val
+            };
+            return RubyString.newStringNoCopy(getRuntime(), digest);
+        }
+
+        @JRubyMethod()
+        public IRubyObject reset() {
+            crc.reset();
+            return this;
+        }
+
+        @JRubyMethod()
+        public IRubyObject digest_length() {
+            return RubyFixnum.newFixnum(getRuntime(), 4);
+        }
+
+        @JRubyMethod()
+        public IRubyObject block_length() {
+            return RubyFixnum.newFixnum(getRuntime(), 8);
+        }
+    }
+}

data/ext/java/org/jruby/ext/digest/RubyDigest.java

@@ -49,6 +49,8 @@ import org.jruby.RubyString;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.anno.JRubyModule;
+import org.jruby.api.Access;
+import org.jruby.api.Define;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
@@ -56,6 +58,7 @@ import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ArraySupport;
 import org.jruby.util.ByteList;
+import org.jruby.util.TypeConverter;
 import org.jruby.util.log.Logger;
 import org.jruby.util.log.LoggerFactory;
 
@@ -91,15 +94,16 @@ public class RubyDigest {
         }
         catch (Throwable t) { /* provider is not available */ }
 
-        RubyModule mDigest = runtime.defineModule("Digest");
-        mDigest.defineAnnotatedMethods(RubyDigest.class);
-        RubyModule mDigestInstance = mDigest.defineModuleUnder("Instance");
-        mDigestInstance.defineAnnotatedMethods(DigestInstance.class);
-        RubyClass cDigestClass = mDigest.defineClassUnder("Class", runtime.getObject(), DigestClass::new);
-        cDigestClass.defineAnnotatedMethods(DigestClass.class);
-        cDigestClass.includeModule(mDigestInstance);
-        RubyClass cDigestBase = mDigest.defineClassUnder("Base", cDigestClass, DigestBase::new);
-        cDigestBase.defineAnnotatedMethods(DigestBase.class);
+        ThreadContext context = runtime.getCurrentContext();
+        RubyModule mDigest = Define.defineModule(context, "Digest");
+        mDigest.defineMethods(context, RubyDigest.class);
+        RubyModule mDigestInstance = mDigest.defineModuleUnder(context, "Instance");
+        mDigestInstance.defineMethods(context, DigestInstance.class);
+        RubyClass cDigestClass = mDigest.defineClassUnder(context, "Class", runtime.getObject(), DigestClass::new);
+        cDigestClass.defineMethods(context, DigestClass.class);
+        cDigestClass.includeModule(context, mDigestInstance);
+        RubyClass cDigestBase = mDigest.defineClassUnder(context, "Base", cDigestClass, DigestBase::new);
+        cDigestBase.defineMethods(context, DigestBase.class);
     }
 
     private static MessageDigest createMessageDigest(final String name) throws NoSuchAlgorithmException {
@@ -196,9 +200,10 @@ public class RubyDigest {
 
     public static void createDigestMD5(Ruby runtime) {
         runtime.getLoadService().require("digest");
-        RubyModule Digest = runtime.getModule("Digest");
-        RubyClass Base = Digest.getClass("Base");
-        RubyClass MD5 = Digest.defineClassUnder("MD5", Base, Base.getAllocator());
+        ThreadContext context = runtime.getCurrentContext();
+        RubyModule Digest = Access.getModule(context, "Digest");
+        RubyClass Base = Digest.getClass(context, "Base");
+        RubyClass MD5 = Digest.defineClassUnder(context, "MD5", Base, Base.getAllocator());
         MD5.setInternalVariable("metadata", new Metadata("MD5", 64));
     }
 
@@ -207,17 +212,19 @@ public class RubyDigest {
         if(provider == null) {
             throw runtime.newLoadError("RMD160 not supported without BouncyCastle");
         }
-        RubyModule Digest = runtime.getModule("Digest");
-        RubyClass Base = Digest.getClass("Base");
-        RubyClass RMD160 = Digest.defineClassUnder("RMD160", Base, Base.getAllocator());
+        ThreadContext context = runtime.getCurrentContext();
+        RubyModule Digest = Access.getModule(context, "Digest");
+        RubyClass Base = Digest.getClass(context, "Base");
+        RubyClass RMD160 = Digest.defineClassUnder(context, "RMD160", Base, Base.getAllocator());
         RMD160.setInternalVariable("metadata", new Metadata("RIPEMD160", 64));
     }
 
     public static void createDigestSHA1(Ruby runtime) {
         runtime.getLoadService().require("digest");
-        RubyModule Digest = runtime.getModule("Digest");
-        RubyClass Base = Digest.getClass("Base");
-        RubyClass SHA1 = Digest.defineClassUnder("SHA1", Base, Base.getAllocator());
+        ThreadContext context = runtime.getCurrentContext();
+        RubyModule Digest = Access.getModule(context, "Digest");
+        RubyClass Base = Digest.getClass(context, "Base");
+        RubyClass SHA1 = Digest.defineClassUnder(context, "SHA1", Base, Base.getAllocator());
         SHA1.setInternalVariable("metadata", new Metadata("SHA1", 64));
     }
 
@@ -231,55 +238,57 @@ public class RubyDigest {
             ex.initCause(e);
             throw ex;
         }
-        final RubyModule Digest = runtime.getModule("Digest");
-        final RubyClass Base = Digest.getClass("Base");
-        RubyClass SHA256 = Digest.defineClassUnder("SHA256", Base, Base.getAllocator());
+        ThreadContext context = runtime.getCurrentContext();
+        final RubyModule Digest = Access.getModule(context, "Digest");
+        final RubyClass Base = Digest.getClass(context, "Base");
+        RubyClass SHA256 = Digest.defineClassUnder(context, "SHA256", Base, Base.getAllocator());
         SHA256.setInternalVariable("metadata", new Metadata("SHA-256", 64));
-        RubyClass SHA384 = Digest.defineClassUnder("SHA384", Base, Base.getAllocator());
+        RubyClass SHA384 = Digest.defineClassUnder(context, "SHA384", Base, Base.getAllocator());
         SHA384.setInternalVariable("metadata", new Metadata("SHA-384", 128));
-        RubyClass SHA512 = Digest.defineClassUnder("SHA512", Base, Base.getAllocator());
+        RubyClass SHA512 = Digest.defineClassUnder(context, "SHA512", Base, Base.getAllocator());
         SHA512.setInternalVariable("metadata", new Metadata("SHA-512", 128));
     }
 
     public static void createDigestBubbleBabble(Ruby runtime) {
         runtime.getLoadService().require("digest");
-        RubyModule Digest = runtime.getModule("Digest");
-        RubyClass Base = Digest.getClass("Base");
-        RubyClass MD5 = Digest.defineClassUnder("BubbleBabble", Base, Base.getAllocator());
+        ThreadContext context = runtime.getCurrentContext();
+        RubyModule Digest = Access.getModule(context, "Digest");
+        RubyClass Base = Digest.getClass(context, "Base");
+        RubyClass MD5 = Digest.defineClassUnder(context, "BubbleBabble", Base, Base.getAllocator());
         MD5.setInternalVariable("metadata", new Metadata("BubbleBabble", 64));
     }
 
     @JRubyModule(name = "Digest::Instance")
     public static class DigestInstance {
 
-        private static IRubyObject throwUnimplError(IRubyObject self, String name) {
-            throw self.getRuntime().newRuntimeError(String.format("%s does not implement %s()", self.getMetaClass().getRealClass().getName(), name));
+        private static IRubyObject throwUnimplError(ThreadContext context, IRubyObject self, String name) {
+            throw self.getRuntime().newRuntimeError(String.format("%s does not implement %s()", self.getMetaClass().getRealClass().getName(context), name));
         }
 
         /* instance methods that should be overridden */
         @JRubyMethod(name = {"update", "<<"}, required = 1)
         public static IRubyObject update(ThreadContext context, IRubyObject self, IRubyObject arg) {
-            return throwUnimplError(self, "update");
+            return throwUnimplError(context, self, "update");
         }
 
         @JRubyMethod()
         public static IRubyObject finish(ThreadContext context, IRubyObject self) {
-            return throwUnimplError(self, "finish");
+            return throwUnimplError(context, self, "finish");
         }
 
         @JRubyMethod()
         public static IRubyObject reset(ThreadContext context, IRubyObject self) {
-            return throwUnimplError(self, "reset");
+            return throwUnimplError(context, self, "reset");
         }
 
         @JRubyMethod()
         public static IRubyObject digest_length(ThreadContext context, IRubyObject self) {
-            return digest(context, self, null).convertToString().bytesize();
+            return digest(context, self, null).convertToString().bytesize(context);
         }
 
         @JRubyMethod()
         public static IRubyObject block_length(ThreadContext context, IRubyObject self) {
-            return throwUnimplError(self, "block_length");
+            return throwUnimplError(context, self, "block_length");
         }
 
         /* instance methods that may be overridden */
@@ -288,21 +297,23 @@ public class RubyDigest {
             if(oth.isNil()) return context.fals;
 
             RubyString str1, str2;
-            RubyModule instance = (RubyModule)context.runtime.getModule("Digest").getConstantAt("Instance");
+            RubyModule instance = (RubyModule)Access.getModule(context, "Digest").getConstantAt(context, "Instance");
             if (oth.getMetaClass().getRealClass().hasModuleInHierarchy(instance)) {
                 str1 = digest(context, self, null).convertToString();
                 str2 = digest(context, oth, null).convertToString();
             } else {
                 str1 = to_s(context, self).convertToString();
-                str2 = oth.convertToString();
+                IRubyObject converted = TypeConverter.checkStringType(context.runtime, oth);
+                if (converted.isNil()) return context.fals;
+                str2 = (RubyString) converted;
             }
-            boolean ret = str1.bytesize().eql(str2.bytesize()) && (str1.eql(str2));
+            boolean ret = str1.bytesize(context).eql(str2.bytesize(context)) && (str1.eql(str2));
             return ret ? context.tru : context.fals;
         }
 
         @JRubyMethod()
         public static IRubyObject inspect(ThreadContext context, IRubyObject self) {
-            return RubyString.newStringNoCopy(self.getRuntime(), ByteList.plain("#<" + self.getMetaClass().getRealClass().getName() + ": " + hexdigest(context, self, null) + ">"));
+            return RubyString.newStringNoCopy(self.getRuntime(), ByteList.plain("#<" + self.getMetaClass().getRealClass().getName(context) + ": " + hexdigest(context, self, null) + ">"));
         }
 
         /* instance methods that need not usually be overridden */
@@ -364,6 +375,8 @@ public class RubyDigest {
 
     @JRubyClass(name="Digest::Class")
     public static class DigestClass extends RubyObject {
+        private static final long serialVersionUID = 1956465293454003972L;
+
         public DigestClass(Ruby runtime, RubyClass type) {
             super(runtime, type);
         }
@@ -397,13 +410,16 @@ public class RubyDigest {
 
     @JRubyClass(name="Digest::Base")
     public static class DigestBase extends RubyObject {
-        private MessageDigest algo;
+        private static final long serialVersionUID = -2526926208784906213L;
+
+        private transient MessageDigest algo;
         private int blockLength = 0;
 
         public DigestBase(Ruby runtime, RubyClass type) {
             super(runtime,type);
 
-            if(type == runtime.getModule("Digest").getClass("Base")) {
+            ThreadContext context = runtime.getCurrentContext();
+            if(type == Access.getModule(context, "Digest").getClass(context, "Base")) {
                 throw runtime.newNotImplementedError("Digest::Base is an abstract class");
             }
 
@@ -433,7 +449,7 @@ public class RubyDigest {
 
         @JRubyMethod(required = 1, visibility = Visibility.PRIVATE)
         @Override
-        public IRubyObject initialize_copy(IRubyObject obj) {
+        public IRubyObject initialize_copy(ThreadContext context, IRubyObject obj) {
             if (this == obj) return this;
 
             DigestBase from = (DigestBase) obj;
@@ -444,7 +460,7 @@ public class RubyDigest {
             }
             catch (CloneNotSupportedException e) {
                 String name = from.algo.getAlgorithm();
-                throw getRuntime().newTypeError("Could not initialize copy of digest (" + name + ")");
+                throw getRuntime().newRaiseException(getRuntime().getTypeError(), "Could not initialize copy of digest (" + name + ")");
             }
             return this;
         }

data/ext/java/org/jruby/ext/digest/lib/digest/crc32.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require "digest.jar"
+JRuby::Util.load_ext("org.jruby.ext.digest.CRC32")

data/lib/digest/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 module Digest
-  VERSION = "3.2.1"
+  # The version string
+  VERSION = "3.3.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: digest
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: java
 authors:
 - Akinori MUSHA
 bindir: exe
 cert_chain: []
-date: 2025-10-31 00:00:00.000000000 Z
+date: 2026-10-08 00:00:00.000000000 Z
 dependencies: []
 description: Provides a framework for message digest libraries.
 email:
@@ -19,6 +19,7 @@ files:
 - LICENSE.txt
 - README.md
 - ext/java/org/jruby/ext/digest/BubbleBabble.java
+- ext/java/org/jruby/ext/digest/CRC32.java
 - ext/java/org/jruby/ext/digest/DigestLibrary.java
 - ext/java/org/jruby/ext/digest/MD5.java
 - ext/java/org/jruby/ext/digest/RMD160.java
@@ -26,6 +27,7 @@ files:
 - ext/java/org/jruby/ext/digest/SHA1.java
 - ext/java/org/jruby/ext/digest/SHA2.java
 - ext/java/org/jruby/ext/digest/lib/digest/bubblebabble.rb
+- ext/java/org/jruby/ext/digest/lib/digest/crc32.rb
 - ext/java/org/jruby/ext/digest/lib/digest/loader.rb
 - ext/java/org/jruby/ext/digest/lib/digest/md5.rb
 - ext/java/org/jruby/ext/digest/lib/digest/rmd160.rb
@@ -56,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.22
 specification_version: 4
 summary: Provides a framework for message digest libraries.
 test_files: []