From d78bcbb85171f27d69ae26c385cb1152ea8aee27 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Tue, 1 Aug 2017 00:01:33 +0300
Subject: [PATCH] - Adjust tests to run on both OpenSSL 1.1 and later and
earlier versions.
---
tests/ssl-ca.bats | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/ssl-ca.bats b/tests/ssl-ca.bats
index bbd537e..0a9a249 100644
--- a/tests/ssl-ca.bats
+++ b/tests/ssl-ca.bats
@@ -30,8 +30,8 @@ match () {
verify certs/www
match keys/www certs/www
[ "$(openssl rsa -noout -check -in keys/www)" = "RSA key ok" ]
- [ "$(openssl x509 -in certs/www -issuer -noout)" = "issuer=CN = ssl-ca" ]
- [ "$(openssl x509 -in certs/www -subject -noout)" = "subject=CN = www.ssl-ca" ]
+ [ "$(openssl x509 -in certs/www -issuer -noout | sed 's@[ /]@@g')" = "issuer=CN=ssl-ca" ]
+ [ "$(openssl x509 -in certs/www -subject -noout | sed 's@[ /]@@g')" = "subject=CN=www.ssl-ca" ]
}
@@ -40,8 +40,8 @@ match () {
./ssl-ca sign
verify certs/smtp
match keys/smtp certs/smtp
- [ "$(openssl x509 -in certs/smtp -issuer -noout)" = "issuer=CN = ssl-ca" ]
- [ "$(openssl x509 -in certs/smtp -subject -noout)" = "subject=CN = smtp.ssl-ca" ]
+ [ "$(openssl x509 -in certs/smtp -issuer -noout | sed 's@[ /]@@g')" = "issuer=CN=ssl-ca" ]
+ [ "$(openssl x509 -in certs/smtp -subject -noout | sed 's@[ /]@@g')" = "subject=CN=smtp.ssl-ca" ]
}
@@ -53,10 +53,10 @@ match () {
match keys/www certs/www
verify certs/smtp
match keys/smtp certs/smtp
- [ "$(openssl x509 -in certs/www -issuer -noout)" = "issuer=CN = ssl-ca" ]
- [ "$(openssl x509 -in certs/www -subject -noout)" = "subject=CN = www.ssl-ca" ]
- [ "$(openssl x509 -in certs/smtp -issuer -noout)" = "issuer=CN = ssl-ca" ]
- [ "$(openssl x509 -in certs/smtp -subject -noout)" = "subject=CN = smtp.ssl-ca" ]
+ [ "$(openssl x509 -in certs/www -issuer -noout | sed 's@[ /]@@g')" = "issuer=CN=ssl-ca" ]
+ [ "$(openssl x509 -in certs/www -subject -noout | sed 's@[ /]@@g')" = "subject=CN=www.ssl-ca" ]
+ [ "$(openssl x509 -in certs/smtp -issuer -noout | sed 's@[ /]@@g')" = "issuer=CN=ssl-ca" ]
+ [ "$(openssl x509 -in certs/smtp -subject -noout | sed 's@[ /]@@g')" = "subject=CN=smtp.ssl-ca" ]
}
@test "webserver" {
--
GitLab