sha3 2.2.2 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5da48a8f70ea2746484300e05125b21ab1fcd5837d0f194d8b12fac46a46602
-  data.tar.gz: 7be8cf46c2e1e4bc38dedb64b25654f70806d6c761427b062c171bf0df359caa
+  metadata.gz: 313cf6f3d1b2847839a7ced1c6c80a8f979d02bbb63be4d6aad29d8aa867e94f
+  data.tar.gz: 8082b5d96c084bd05e86d7213ed17b982200381dd7f187ffa1bfd122e44ceeac
 SHA512:
-  metadata.gz: 57e70a0c38eb04f0aab1fe81f0c3ee60a6eb2bc7ea6c6f2e57f8712f23084139bd4a494cde70ad99eca7e20fe1534adb7f91b9986a4ad31ac1127ffa4a115d07
-  data.tar.gz: 0b7cdd43dc7167e3e92f4ec2adfb947c00f0b8827aaaeafb9383213bdd1bc09771c0b17efec3d28667b1bb383646f006360496abf3dfd43a2a6cd54f8e1dd4c2
+  metadata.gz: 3c1fce17c84d6c28cd1d2695b0aee6c6ef122ad76e16558ba8788f1ea952f626448af264541e8161f3e4835da292b76da7f46dd4e21061ecce8cadf77ba93791
+  data.tar.gz: deb57b637c2e3c7ec65b189de11404005e72e3809e1b3cbc982a3ce66ba2918d597e7a5039e373200afb1ce0d23ccf704d7d2974f9799b229b74486eb009b7b0

data/.document

@@ -1,4 +1,5 @@
 README.md
 LICENSE.txt
+CHANGELOG.md
 doc/**/*.rb
 ext/sha3/*.c

data/.rubocop.yml

@@ -6,8 +6,74 @@ AllCops:
   NewCops: enable
   TargetRubyVersion: 2.7
 
+  Exclude:
+    - ext/**/*.rb
+
 Layout/LineLength:
   Max: 120
 
+# Metrics
+
+Metrics/AbcSize:
+  Exclude:
+    - spec/**/*_spec.rb
+
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - spec/**/*_spec.rb
+
+Metrics/PerceivedComplexity:
+  Exclude:
+    - spec/**/*_spec.rb
+
+Metrics/MethodLength:
+  Max: 15
+  Exclude:
+    - spec/**/*_spec.rb
+
+# Naming
+
+Naming/ClassAndModuleCamelCase:
+  Enabled: false
+
 Naming/VariableNumber:
   EnforcedStyle: snake_case
+  Exclude:
+    - spec/**/*.rb
+
+# Security
+
+# Allow URI.open for test vector downloads
+Security/Open:
+  Exclude:
+    - spec/sha3_digest_vectors_spec.rb
+
+# RSpec configuration
+
+RSpec/ExampleLength:
+  Max: 15
+  CountAsOne:
+    - array
+    - hash
+    - heredoc
+
+RSpec/MultipleExpectations:
+  Max: 8
+
+RSpec/SpecFilePathFormat:
+  Enabled: false
+
+RSpec/LeakyConstantDeclaration:
+  Enabled: false
+
+RSpec/BeforeAfterAll:
+  Enabled: false
+
+RSpec/MultipleDescribes:
+  Enabled: false
+
+RSpec/NamedSubject:
+  Enabled: false
+
+RSpec/DescribeClass:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 # SHA3 Ruby Gem Changelog
 
+## v2.2.3 (2025-09-05)
+
+### Bug Fixes
+- Fixed memory leak by freeing context memory on allocation failure in rb_sha3_digest_alloc
+- Fixed heredoc delimiters for description and post-install message in gemspec
+- Fixed example comment typo in cshake
+
+### Improvements
+- Introduced common abstraction layer for SP800-185 algorithms (cSHAKE, KMAC)
+- Improved memory management and error handling in digest.c
+- Significantly reduced code duplication in cshake.c and kmac.c
+
+### Testing
+- Improved test organization and coverage for SHA3 algorithms
+- Added comprehensive tests for edge cases and error conditions
+
+### Maintenance
+- Added RuboCop configuration for code style consistency
+
+## v2.2.2 (2025-09-05)
+
+### Improvements
+- Streamlined SP800-185 algorithm initialization
+- Enhanced error handling in cSHAKE and KMAC implementations
+- Refactored internal API for better maintainability
+
+## v2.2.1 (2025-09-05)
+
+### Bug Fixes
+- Fixed out-of-bounds array access when parsing optional key arguments in cSHAKE
+
+### Maintenance
+- Removed obsolete macro definitions for Ruby methods in SP800-185 header
+
 ## v2.2.0 (2025-03-15)
 
 ### Features

data/README.md

@@ -38,6 +38,7 @@ This gem provides support for the standard SHA-3 fixed-length functions (224, 25
 - [API Documentation](https://docs.jsg.io/sha3/html/index.html)
 - [GitHub Repository](https://github.com/johanns/sha3#readme)
 - [Issue Tracker](https://github.com/johanns/sha3/issues)
+- [Changelog](CHANGELOG.md)
 
 ## Features
 

data/certs/io+sha3@jsg.io.pem

@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 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
-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
+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
-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
+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
-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
-uYUv/V6CD4iTEMby0dopwHt5NqE=
+MA0GCSqGSIb3DQEBCwUAA4IBgQBI38LgcqdqpfkaiEGfr3fLtsOBkE1Q7mEHjeIS
+JcEiu16sP0iR/0QzN/DS0vPMQUhl4dvkUl7euVOo8rp0mwzUyaSvq+MSQlpxwgjb
+AQ5A8VAkkIMbTbCqRU9q9KQObmO8/NaFFFGgmRegp8eBEGdixbiIsReEeWzEICe1
+TOmXWl1X7EBUF7CdSIHxBAjF16YXJoDJp16DonZ/pzbgeO85OzFmfnA+B9nsHXS4
+3CeJ/lKznIM8XWSXA1ruSkZeB5ouNtauqSAaBJoMkAB0DbOrZ6yo/mP8x3WtSLKY
+SdQdy412nPewWa08VXIjZqd1Q+rI9Wq2pY6TOqML1Iu5nB2VMAr9PoHcIPz1P9N8
+sM8XX4fXOsMtSc4SzMOqlkg2qRdo4/1eIjVSxCM84VqppRnH8syAzny6COQ0Xo+z
+/PqqO8TUsynEGVsjIkBIa8Y5zoXBfcQ6PQpSbeY0bXhhsxclL3fKWSQQC4MN/OFE
+5aeBE+xHYdmI3UoIAXt1xB0hU9w=
 -----END CERTIFICATE-----

data/ext/sha3/common.h

@@ -0,0 +1,118 @@
+// Copyright (c) 2025 Johanns Gregorian <io+sha3@jsg.io>
+
+#ifndef _SHA3_COMMON_H_
+#define _SHA3_COMMON_H_
+
+#include <ruby.h>
+
+#include "sp800_185.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Common macros for SP800-185 based implementations (CSHAKE, KMAC) */
+
+/* Define a simple method that just calls an sp800_185 function */
+#define DEFINE_SP800_185_SIMPLE_METHOD(method_name, sp_func, get_ctx_func) \
+    static VALUE method_name(VALUE self, VALUE data) {                     \
+        sp800_185_context_t *context;                                      \
+        get_ctx_func(self, &context);                                      \
+        sp_func(context, data);                                            \
+        return self;                                                       \
+    }
+
+/* Define a method that returns a value from sp800_185 function */
+#define DEFINE_SP800_185_RETURN_METHOD(method_name, sp_func, get_ctx_func) \
+    static VALUE method_name(VALUE self) {                                 \
+        sp800_185_context_t *context;                                      \
+        get_ctx_func(self, &context);                                      \
+        return sp_func(context);                                           \
+    }
+
+/* Define a method with single VALUE parameter that returns VALUE */
+#define DEFINE_SP800_185_VALUE_METHOD(method_name, sp_func, get_ctx_func) \
+    static VALUE method_name(VALUE self, VALUE param) {                   \
+        sp800_185_context_t *context;                                     \
+        get_ctx_func(self, &context);                                     \
+        return sp_func(context, param);                                   \
+    }
+
+/* Define a method with variable arguments */
+#define DEFINE_SP800_185_VARARGS_METHOD(method_name, sp_func, get_ctx_func) \
+    static VALUE method_name(int argc, VALUE *argv, VALUE self) {           \
+        sp800_185_context_t *context;                                       \
+        get_ctx_func(self, &context);                                       \
+        VALUE param = argc > 0 ? argv[0] : Qnil;                            \
+        return sp_func(context, param);                                     \
+    }
+
+/* Define common memory management functions */
+#define DEFINE_SP800_185_MEMORY_FUNCS(prefix, context_type)                                              \
+    static void prefix##_free_context(void *ptr) { sp800_185_free_context((sp800_185_context_t *)ptr); } \
+                                                                                                         \
+    static size_t prefix##_context_size(const void *ptr) {                                               \
+        return sp800_185_context_size((const sp800_185_context_t *)ptr, sizeof(context_type));           \
+    }
+
+/* Define common allocation function */
+#define DEFINE_SP800_185_ALLOC(prefix, context_type, instance_type, error_class)                                      \
+    static VALUE rb_##prefix##_alloc(VALUE klass) {                                                                   \
+        context_type *context = (context_type *)sp800_185_alloc_context(sizeof(context_type), sizeof(instance_type)); \
+                                                                                                                      \
+        if (!context) {                                                                                               \
+            rb_raise(error_class, "failed to allocate memory");                                                       \
+        }                                                                                                             \
+                                                                                                                      \
+        VALUE obj = TypedData_Wrap_Struct(klass, &prefix##_data_type, context);                                       \
+        return obj;                                                                                                   \
+    }
+
+/* Define common copy method */
+#define DEFINE_SP800_185_COPY_METHOD(method_name, context_type, data_type, class_var)                    \
+    static VALUE method_name(VALUE self, VALUE other) {                                                  \
+        context_type *context, *other_context;                                                           \
+                                                                                                         \
+        rb_check_frozen(self);                                                                           \
+        if (self == other) {                                                                             \
+            return self;                                                                                 \
+        }                                                                                                \
+                                                                                                         \
+        if (!rb_obj_is_kind_of(other, class_var)) {                                                      \
+            rb_raise(rb_eTypeError, "wrong argument (%s)! (expected %s)", rb_obj_classname(other),       \
+                     rb_class2name(class_var));                                                          \
+        }                                                                                                \
+                                                                                                         \
+        TypedData_Get_Struct(other, context_type, &data_type, other_context);                            \
+        TypedData_Get_Struct(self, context_type, &data_type, context);                                   \
+                                                                                                         \
+        /* Copy the base context attributes */                                                           \
+        context->base.functions = other_context->base.functions;                                         \
+        context->base.output_length = other_context->base.output_length;                                 \
+        context->base.error_class = other_context->base.error_class;                                     \
+                                                                                                         \
+        /* Copy the algorithm-specific state */                                                          \
+        if (context->base.functions && other_context->base.state) {                                      \
+            memcpy(context->base.state, other_context->base.state, context->base.functions->state_size); \
+        }                                                                                                \
+                                                                                                         \
+        return self;                                                                                     \
+    }
+
+/* Ruby wrapper functions for SP800-185 operations */
+VALUE sp800_185_rb_update(sp800_185_context_t *context, VALUE data);
+VALUE sp800_185_rb_name(sp800_185_context_t *context);
+VALUE sp800_185_rb_finish(sp800_185_context_t *context, VALUE output);
+VALUE sp800_185_rb_digest(sp800_185_context_t *context, VALUE data);
+VALUE sp800_185_rb_hexdigest(sp800_185_context_t *context, VALUE data);
+VALUE sp800_185_rb_squeeze(sp800_185_context_t *context, VALUE length);
+VALUE sp800_185_rb_hex_squeeze(sp800_185_context_t *context, VALUE length);
+
+/* Helper function to register common methods */
+void register_sp800_185_common_methods(VALUE klass);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _SHA3_COMMON_H_ */

data/ext/sha3/cshake.c

@@ -1,5 +1,6 @@
 #include "cshake.h"
 
+#include "common.h"
 #include "sha3.h"
 #include "sp800_185.h"
 
@@ -48,7 +49,8 @@ static const rb_data_type_t sha3_cshake_data_type = {
     },
     NULL,
     NULL,
-    RUBY_TYPED_FREE_IMMEDIATELY};
+    RUBY_TYPED_FREE_IMMEDIATELY,
+};
 
 // Helper function to extract context from a Ruby object
 void get_cshake_context(VALUE obj, sp800_185_context_t **context) {
@@ -76,7 +78,7 @@ void Init_sha3_cshake(void) {
     /*
      * Document-class: SHA3::CSHAKE::Error
      *
-     * All KMAC methods raise this exception on error.
+     * All CSHAKE methods raise this exception on error.
      *
      * It is a subclass of the StandardError class -- see the Ruby documentation
      * for more information.
@@ -104,25 +106,11 @@ void Init_sha3_cshake(void) {
     return;
 }
 
-static void sha3_cshake_free_context(void *ptr) { sp800_185_free_context((sp800_185_context_t *)ptr); }
+/* Use common memory management functions */
+DEFINE_SP800_185_MEMORY_FUNCS(sha3_cshake, sha3_cshake_context_t)
 
-static size_t sha3_cshake_context_size(const void *ptr) {
-    return sp800_185_context_size((const sp800_185_context_t *)ptr, sizeof(sha3_cshake_context_t));
-}
-
-static VALUE rb_sha3_cshake_alloc(VALUE klass) {
-    sha3_cshake_context_t *context =
-        (sha3_cshake_context_t *)sp800_185_alloc_context(sizeof(sha3_cshake_context_t), sizeof(cSHAKE_Instance));
-
-    if (!context) {
-        rb_raise(_sha3_cshake_error_class, "failed to allocate memory");
-    }
-
-    // Create the Ruby object with TypedData - this will automatically handle freeing
-    VALUE obj = TypedData_Wrap_Struct(klass, &sha3_cshake_data_type, context);
-
-    return obj;
-}
+/* Use common allocation function */
+DEFINE_SP800_185_ALLOC(sha3_cshake, sha3_cshake_context_t, cSHAKE_Instance, _sha3_cshake_error_class)
 
 /*
  * :call-seq:
@@ -144,14 +132,14 @@ static VALUE rb_sha3_cshake_alloc(VALUE klass) {
  *   _optional_ The customization string to use
  *
  * = example
- *   # Initialize instance for fix-ed-length operation
+ *   # Initialize instance for fixed-length operation
  *   cshake = SHA3::CSHAKE.new(:cshake_128, 32, name: 'my-app')
  *   cshake << 'data...'
  *   cshake.hexdigest
  *
  *   # Initialize instance for XOF operation (arbitrary-long output)
  *   cshake = SHA3::CSHAKE.new(:cshake_256, 0, customization: 'Email Signature')
- *   cshask.update('data...')
+ *   cshake.update('data...')
  *   cshake.squeeze(64)
  */
 static VALUE rb_sha3_cshake_init(int argc, VALUE *argv, VALUE self) {
@@ -233,31 +221,7 @@ static VALUE rb_sha3_cshake_init(int argc, VALUE *argv, VALUE self) {
  * = example
  *  cshake2 = cshake.dup
  */
-static VALUE rb_sha3_cshake_copy(VALUE self, VALUE other) {
-    sha3_cshake_context_t *context, *other_context;
-
-    rb_check_frozen(self);
-    if (self == other) {
-        return self;
-    }
-
-    if (!rb_obj_is_kind_of(other, _sha3_cshake_class)) {
-        rb_raise(rb_eTypeError, "wrong argument (%s)! (expected %s)", rb_obj_classname(other),
-                 rb_class2name(_sha3_cshake_class));
-    }
-
-    TypedData_Get_Struct(other, sha3_cshake_context_t, &sha3_cshake_data_type, other_context);
-    TypedData_Get_Struct(self, sha3_cshake_context_t, &sha3_cshake_data_type, context);
-
-    // Copy the base context attributes
-    context->base.functions = other_context->base.functions;
-    context->base.output_length = other_context->base.output_length;
-
-    // Copy the algorithm-specific state
-    memcpy(context->base.state, other_context->base.state, context->base.functions->state_size);
-
-    return self;
-}
+DEFINE_SP800_185_COPY_METHOD(rb_sha3_cshake_copy, sha3_cshake_context_t, sha3_cshake_data_type, _sha3_cshake_class)
 
 /*
  * :call-seq:
@@ -272,13 +236,7 @@ static VALUE rb_sha3_cshake_copy(VALUE self, VALUE other) {
  *   cshake.update("more data")
  *   cshake << "more data"  # alias for update
  */
-static VALUE rb_sha3_cshake_update(VALUE self, VALUE data) {
-    sp800_185_context_t *context;
-    get_cshake_context(self, &context);
-    sp800_185_update(context, data);
-
-    return self;
-}
+DEFINE_SP800_185_SIMPLE_METHOD(rb_sha3_cshake_update, sp800_185_rb_update, get_cshake_context)
 
 /*
  * :call-seq:
@@ -286,12 +244,7 @@ static VALUE rb_sha3_cshake_update(VALUE self, VALUE data) {
  *
  * Returns the name of the CSHAKE instance.
  */
-static VALUE rb_sha3_cshake_name(VALUE self) {
-    sp800_185_context_t *context;
-    get_cshake_context(self, &context);
-
-    return rb_str_new2(sp800_185_name(context));
-}
+DEFINE_SP800_185_RETURN_METHOD(rb_sha3_cshake_name, sp800_185_rb_name, get_cshake_context)
 
 /*
  * :call-seq:
@@ -305,13 +258,7 @@ static VALUE rb_sha3_cshake_name(VALUE self) {
  * = example
  *   cshake.finish
  */
-static VALUE rb_sha3_cshake_finish(int argc, VALUE *argv, VALUE self) {
-    sp800_185_context_t *context;
-    get_cshake_context(self, &context);
-
-    VALUE output = argc > 0 ? argv[0] : Qnil;
-    return sp800_185_finish(context, output);
-}
+DEFINE_SP800_185_VARARGS_METHOD(rb_sha3_cshake_finish, sp800_185_rb_finish, get_cshake_context)
 
 /*
  * :call-seq:
@@ -326,14 +273,7 @@ static VALUE rb_sha3_cshake_finish(int argc, VALUE *argv, VALUE self) {
  *   cshake.digest
  *   cshake.digest("final chunk")
  */
-static VALUE rb_sha3_cshake_digest(int argc, VALUE *argv, VALUE self) {
-    sp800_185_context_t *context;
-    get_cshake_context(self, &context);
-
-    VALUE data = argc > 0 ? argv[0] : Qnil;
-
-    return sp800_185_digest(context, data);
-}
+DEFINE_SP800_185_VARARGS_METHOD(rb_sha3_cshake_digest, sp800_185_rb_digest, get_cshake_context)
 
 /*
  * :call-seq:
@@ -348,14 +288,7 @@ static VALUE rb_sha3_cshake_digest(int argc, VALUE *argv, VALUE self) {
  *   cshake.hexdigest
  *   cshake.hexdigest("final chunk")
  */
-static VALUE rb_sha3_cshake_hexdigest(int argc, VALUE *argv, VALUE self) {
-    sp800_185_context_t *context;
-    get_cshake_context(self, &context);
-
-    VALUE data = argc > 0 ? argv[0] : Qnil;
-
-    return sp800_185_hexdigest(context, data);
-}
+DEFINE_SP800_185_VARARGS_METHOD(rb_sha3_cshake_hexdigest, sp800_185_rb_hexdigest, get_cshake_context)
 
 /*
  * :call-seq:
@@ -369,12 +302,7 @@ static VALUE rb_sha3_cshake_hexdigest(int argc, VALUE *argv, VALUE self) {
  * = example
  *   cshake.squeeze(32)
  */
-static VALUE rb_sha3_cshake_squeeze(VALUE self, VALUE length) {
-    sp800_185_context_t *context;
-    get_cshake_context(self, &context);
-
-    return sp800_185_squeeze(context, length);
-}
+DEFINE_SP800_185_VALUE_METHOD(rb_sha3_cshake_squeeze, sp800_185_rb_squeeze, get_cshake_context)
 
 /*
  * :call-seq:
@@ -388,9 +316,4 @@ static VALUE rb_sha3_cshake_squeeze(VALUE self, VALUE length) {
  * = example
  *   cshake.hex_squeeze(32)
  */
-static VALUE rb_sha3_cshake_hex_squeeze(VALUE self, VALUE length) {
-    sp800_185_context_t *context;
-    get_cshake_context(self, &context);
-
-    return sp800_185_hex_squeeze(context, length);
-}
+DEFINE_SP800_185_VALUE_METHOD(rb_sha3_cshake_hex_squeeze, sp800_185_rb_hex_squeeze, get_cshake_context)