From 224c17876ca5e9ae9aed9d9a219c74e22e79be11 Mon Sep 17 00:00:00 2001
From: Kazuki Yamaguchi <k@rhe.jp>
Date: Mon, 6 Oct 2025 16:16:57 +0900
Subject: [PATCH] [ruby/openssl] Ruby/OpenSSL 3.3.1

https://github.com/ruby/openssl/commit/2b88a6d444
---
 ext/openssl/History.md             | 29 +++++++++++++++++++++++++++++
 ext/openssl/lib/openssl/version.rb |  2 +-
 ext/openssl/openssl.gemspec        |  2 +-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/ext/openssl/History.md b/ext/openssl/History.md
index ad3417f9d0..ecc53fad3b 100644
--- a/ext/openssl/History.md
+++ b/ext/openssl/History.md
@@ -1,3 +1,9 @@
+Version 3.3.1
+=============
+
+Merged changes in 3.1.2 and 3.2.2.
+
+
 Version 3.3.0
 =============
 
@@ -74,6 +80,12 @@ And various non-user-visible changes and bug fixes. Please see the commit
 history for more details.
 
 
+Version 3.2.2
+=============
+
+Merged changes in 3.1.2.
+
+
 Version 3.2.1
 =============
 
@@ -120,6 +132,23 @@ Notable changes
   [[GitHub #141]](https://github.com/ruby/openssl/pull/141)
 
 
+Version 3.1.2
+=============
+
+Bug fixes
+---------
+
+* Fix crash when attempting to export an incomplete `OpenSSL::PKey::DSA` key.
+  [[GitHub #845]](https://github.com/ruby/openssl/issues/845)
+  [[GitHub #847]](https://github.com/ruby/openssl/pull/847)
+* Remove the `OpenSSL::X509::V_FLAG_CRL_CHECK_ALL` flag from the default store
+  used by `OpenSSL::SSL::SSLContext#set_params`. It causes certificate
+  verification to fail with OpenSSL 3.6.0. It has no effect with any other
+  OpenSSL versions.
+  [[GitHub #949]](https://github.com/ruby/openssl/issues/949)
+  [[GitHub #950]](https://github.com/ruby/openssl/pull/950)
+
+
 Version 3.1.1
 =============
 
diff --git a/ext/openssl/lib/openssl/version.rb b/ext/openssl/lib/openssl/version.rb
index 3398fe39cc..8672154c89 100644
--- a/ext/openssl/lib/openssl/version.rb
+++ b/ext/openssl/lib/openssl/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenSSL
-  VERSION = "3.3.0"
+  VERSION = "3.3.1"
 end
diff --git a/ext/openssl/openssl.gemspec b/ext/openssl/openssl.gemspec
index 2ec1551885..aec091f0e0 100644
--- a/ext/openssl/openssl.gemspec
+++ b/ext/openssl/openssl.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "openssl"
-  spec.version       = "3.3.0"
+  spec.version       = "3.3.1"
   spec.authors       = ["Martin Bosslet", "SHIBATA Hiroshi", "Zachary Scott", "Kazuki Yamaguchi"]
   spec.email         = ["ruby-core@ruby-lang.org"]
   spec.summary       = %q{SSL/TLS and general-purpose cryptography for Ruby}