From ed5a7c13060f40a289b190ba2e7fec147c523829 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Fri, 12 Jan 2018 14:43:19 +0100
Subject: ssh: Add LibreSSL to compat tests

---
 .../build_scripts/create-ssh-image                 |  3 ++-
 .../ssh_compat_SUITE_data/build_scripts/create_all | 28 ++++++++++++----------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssh-image b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssh-image
index 983c57b18b..2e08408841 100755
--- a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssh-image
+++ b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssh-image
@@ -47,7 +47,8 @@ cat - > TempDockerFile <<EOF
     RUN ./configure --without-pie \
                     --prefix=/buildroot/ssh \
                     --with-ssl-dir=/buildroot/ssl \
-                    --with-pam
+                    --with-pam \
+                    LDFLAGS=-Wl,-R/buildroot/ssl/lib
     RUN  make
     RUN  make install
     RUN  echo UsePAM yes >> /buildroot/ssh/etc/sshd_config
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create_all b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create_all
index 16b9c21d9f..e4d189b2eb 100755
--- a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create_all
+++ b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create_all
@@ -3,19 +3,21 @@
 UBUNTU_VERSION=16.04
 
 SSH_SSL_VERSIONS=(\
-        openssh 4.4p1  openssl 0.9.8zh \
-        openssh 4.5p1  openssl 0.9.8zh \
-        openssh 5.0p1  openssl 0.9.8zh \
-        openssh 6.2p2  openssl 0.9.8zh \
-        openssh 6.3p1  openssl 0.9.8zh \
-                                       \
-        openssh 7.1p1  openssl 1.0.0t  \
-                                       \
-        openssh 7.1p1  openssl 1.0.1p  \
-                                       \
-        openssh 6.6p1  openssl 1.0.2n  \
-        openssh 7.1p1  openssl 1.0.2n  \
-        openssh 7.6p1  openssl 1.0.2n  \
+        openssh 4.4p1  openssl  0.9.8zh \
+        openssh 4.5p1  openssl  0.9.8zh \
+        openssh 5.0p1  openssl  0.9.8zh \
+        openssh 6.2p2  openssl  0.9.8zh \
+        openssh 6.3p1  openssl  0.9.8zh \
+                                        \
+        openssh 7.1p1  openssl  1.0.0t  \
+                                        \
+        openssh 7.1p1  openssl  1.0.1p  \
+                                        \
+        openssh 6.6p1  openssl  1.0.2n  \
+        openssh 7.1p1  openssl  1.0.2n  \
+        openssh 7.6p1  openssl  1.0.2n  \
+                                        \
+        openssh 7.6p1  libressl 2.6.4   \
 	)
 
 if [ "x$1" == "x-b" ]
-- 
cgit v1.2.3