ruby-openssl-docker: update OpenSSL/LibreSSL

2 files changed, 20 insertions, 13 deletions

diff --git a/tool/ruby-openssl-docker/Dockerfile b/tool/ruby-openssl-docker/Dockerfile
index 4ecc3936..e948a609 100644
--- a/tool/ruby-openssl-docker/Dockerfile
+++ b/tool/ruby-openssl-docker/Dockerfile
@@ -28,29 +28,29 @@ RUN curl -s https://www.openssl.org/source/openssl-1.0.0t.tar.gz | tar -C /build
       shared debug-linux-x86_64 && \
     make && make install_sw
 
-RUN curl -s https://www.openssl.org/source/openssl-1.0.1t.tar.gz | tar -C /build/openssl -xzf - && \
-    cd /build/openssl/openssl-1.0.1t && \
+RUN curl -s https://www.openssl.org/source/openssl-1.0.1u.tar.gz | tar -C /build/openssl -xzf - && \
+    cd /build/openssl/openssl-1.0.1u && \
     ./Configure \
       --openssldir=/opt/openssl/openssl-1.0.1 \
       shared debug-linux-x86_64 && \
     make && make install_sw
 
-RUN curl -s https://www.openssl.org/source/openssl-1.0.2h.tar.gz | tar -C /build/openssl -xzf - && \
-    cd /build/openssl/openssl-1.0.2h && \
+RUN curl -s https://www.openssl.org/source/openssl-1.0.2j.tar.gz | tar -C /build/openssl -xzf - && \
+    cd /build/openssl/openssl-1.0.2j && \
     ./Configure \
       --openssldir=/opt/openssl/openssl-1.0.2 \
       shared debug-linux-x86_64 && \
     make && make install_sw
 
-RUN curl -s https://www.openssl.org/source/openssl-1.1.0.tar.gz | tar -C /build/openssl -xzf - && \
-    cd /build/openssl/openssl-1.1.0 && \
+RUN curl -s https://www.openssl.org/source/openssl-1.1.0b.tar.gz | tar -C /build/openssl -xzf - && \
+    cd /build/openssl/openssl-1.1.0b && \
     ./Configure \
       --prefix=/opt/openssl/openssl-1.1.0 \
       enable-crypto-mdebug enable-crypto-mdebug-backtrace \
       debug-linux-x86_64 && \
     make && make install_sw
 
-# Supported libressl versions: 2.1, 2.2, 2.3, 2.4
+# Supported libressl versions: 2.1, 2.2, 2.3, 2.4, 2.5
 RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.1.10.tar.gz | tar -C /build/openssl -xzf -
 RUN cd /build/openssl/libressl-2.1.10 && \
     ./configure \
@@ -63,18 +63,24 @@ RUN cd /build/openssl/libressl-2.2.9 && \
       --prefix=/opt/openssl/libressl-2.2 && \
     make && make install
 
-RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.3.7.tar.gz | tar -C /build/openssl -xzf -
-RUN cd /build/openssl/libressl-2.3.7 && \
+RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.3.8.tar.gz | tar -C /build/openssl -xzf -
+RUN cd /build/openssl/libressl-2.3.8 && \
     ./configure \
       --prefix=/opt/openssl/libressl-2.3 && \
     make && make install
 
-RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.4.2.tar.gz | tar -C /build/openssl -xzf -
-RUN cd /build/openssl/libressl-2.4.2 && \
+RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.4.3.tar.gz | tar -C /build/openssl -xzf -
+RUN cd /build/openssl/libressl-2.4.3 && \
     ./configure \
       --prefix=/opt/openssl/libressl-2.4 && \
     make && make install
 
+RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.5.0.tar.gz | tar -C /build/openssl -xzf -
+RUN cd /build/openssl/libressl-2.5.0 && \
+    ./configure \
+      --prefix=/opt/openssl/libressl-2.5 && \
+    make && make install
+
 # Supported Ruby versions: 2.3
 RUN mkdir -p /build/ruby
 RUN curl -s https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.1.tar.gz | tar -C /build/ruby -xzf - && \
diff --git a/tool/ruby-openssl-docker/README.md b/tool/ruby-openssl-docker/README.md
index 5211dd77..93c75ed3 100644
--- a/tool/ruby-openssl-docker/README.md
+++ b/tool/ruby-openssl-docker/README.md
@@ -1,5 +1,6 @@
 # ruby-openssl-docker
 
-Supports OpenSSL 1.0.0t, 1.0.1q, 1.0.2e and LibreSSL 2.1.9, 2.2.5 and 2.3.1.
+Docker image for testing. The image contains various binaries of supported
+versions of OpenSSL, LibreSSL, and Ruby.
 
-Currently only Ruby 2.3.0 is supported.
+CONTRIBUTING.md on the top directory describes how to use the image.