[GR-38028] Update openssl gem to support libssl 3.0.0

PullRequest: truffleruby/3375

Author: eregon

CHANGELOG.md

@@ -3,6 +3,7 @@
 New features:
 
 * Add support for `darwin-aarch64` (macOS M1) (#2181, @lewurm, @chrisseaton, @eregon).
+* Add support for OpenSSL 3.0.0 by updating the openssl gem (@aardvark179, @eregon).
 
 Bug fixes:
 

README.md

@@ -86,12 +86,10 @@ Runtime configurations are further detailed in [Deploying TruffleRuby](doc/user/
 
 TruffleRuby is actively tested on the following systems:
 
-* Oracle Linux 7
-* Ubuntu 18.04 LTS
-* Ubuntu 16.04 LTS
-* Fedora 28
-* macOS 10.14 (Mojave)
-* macOS 10.15 (Catalina)
+* Oracle Linux 7, 8
+* Ubuntu 16.04, 18.04, 20.04, 22.04 (all LTS)
+* Fedora 35, 36
+* macOS 10.14 (Mojave), 12 (Monterey)
 
 Architectures:
 

ci.jsonnet

@@ -69,6 +69,7 @@ local part_definitions = {
         # Fail if any command part of the pipe fails
         ["set", "-o", "pipefail"],
         ["ruby", "--version"],
+        ["openssl", "version"],
       ],
 
       logs+: [
@@ -269,6 +270,10 @@ local part_definitions = {
         normal_machine: ["linux", "amd64"],
         bench_machine: ["x52"] + self.normal_machine + ["no_frequency_scaling"],
       },
+      docker: {
+        image: "phx.ocir.io/oraclelabs2/c_graal/buildslave:buildslave_ol7",
+        mount_modules: true,
+      },
     },
     linux_aarch64: linux_deps + {
       platform_name:: "LinuxAArch64",
@@ -336,6 +341,7 @@ local part_definitions = {
     test_specs_mri: {
       environment+: {
         "CHECK_LEAKS": "true",
+        "RUBY_SPEC_TEST_ZLIB_CRC_TABLE": "false", # CRuby was built on OL6 and is used on OL7
       },
       run+: jt(["-u", mri_path(mri_version), "mspec", "spec/ruby"]) +
             jt(["-u", mri_path("2.7.2"), "mspec", "spec/ruby"]),

doc/user/installing-libssl.md

@@ -6,10 +6,10 @@ permalink: /reference-manual/ruby/Installinglibssl/
 ---
 # Installing `libssl`
 
-TruffleRuby provides the `openssl` module but not the native `libssl` system library that the module uses.
-TruffleRuby supports libssl versions 1.0.2 and 1.1.0 (not 3.0.0 currently).
+TruffleRuby provides the `openssl` gem but not the native `libssl` system library that the gem uses.
+TruffleRuby supports libssl versions 1.0.2, 1.1.0 and 3.0.0.
 
-If you experience `openssl`-related errors, it might help to recompile the `openssl` module by running `lib/truffle/post_install_hook.sh`.
+If you experience `openssl`-related errors, it might help to recompile the `openssl` gem by running `lib/truffle/post_install_hook.sh`.
 This is done automatically by Ruby managers, and mentioned in the post-install message when installing TruffleRuby via `gu install` in GraalVM.
 
 To compile TruffleRuby against a non-system `libssl`, set `OPENSSL_PREFIX` while installing TruffleRuby:
@@ -19,8 +19,6 @@ export OPENSSL_PREFIX=/path/to/my/openssl-1.1.0
 
 ### RedHat-based: Fedora, Oracle Linux, etc
 
-On Fedora 36, use `openssl1.1-devel` instead.
-
 ```bash
 sudo dnf install openssl-devel
 ```

lib/cext/ABI_version.txt

@@ -1 +1 @@
-6
+7

lib/cext/include/truffleruby/config_linux_amd64.h

@@ -238,6 +238,7 @@
 #define HAVE_ATAN2L 1
 #define HAVE_ATAN2F 1
 #define HAVE_CHROOT 1
+#define HAVE_CLOCK_GETTIME 1
 #define HAVE_COSH 1
 #define HAVE_CRYPT_R 1
 #define HAVE_DIRFD 1
@@ -370,8 +371,6 @@
 #define HAVE_BUILTIN___BUILTIN_TRAP 1
 #define HAVE_GNU_QSORT_R 1
 #define ATAN2_INF_C99 1
-#define HAVE_LIBRT 1
-#define HAVE_CLOCK_GETTIME 1
 #define HAVE_CLOCK_GETRES 1
 #define HAVE_LIBRT 1
 #define HAVE_LIBRT 1

lib/mri/openssl.rb

@@ -15,7 +15,6 @@
 require_relative 'openssl/bn'
 require_relative 'openssl/pkey'
 require_relative 'openssl/cipher'
-require_relative 'openssl/config'
 require_relative 'openssl/digest'
 require_relative 'openssl/hmac'
 require_relative 'openssl/x509'

lib/mri/openssl/buffering.rb

@@ -101,6 +101,15 @@ def consume_rbuff(size=nil)
 
   public
 
+  # call-seq:
+  #   ssl.getbyte => 81
+  #
+  # Get the next 8bit byte from `ssl`.  Returns `nil` on EOF
+  def getbyte
+    byte = read(1)
+    byte && byte.unpack1("C")
+  end
+
   ##
   # Reads _size_ bytes from the stream.  If _buf_ is provided it must
   # reference a string which will receive the data.