From af02608fc7689a443df075337913c2030e03a5e0 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Tue, 22 Aug 2017 14:09:27 +0300
Subject: [PATCH] - Fixup for the tests.

---
 tests/bundle-certs.bats | 16 ++++++++--------
 tests/openssl.cnf       |  8 ++++++++
 2 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 tests/openssl.cnf

diff --git a/tests/bundle-certs.bats b/tests/bundle-certs.bats
index 9401ebb..893d17b 100644
--- a/tests/bundle-certs.bats
+++ b/tests/bundle-certs.bats
@@ -5,22 +5,22 @@ setup () {
     mkdir -p .testcerts
 	echo 1000 > .testcerts/serial
 	openssl genrsa -out .testcerts/root.key 4096
-	openssl req -new -x509 -days 7 -key .testcerts/root.key -nodes -out .testcerts/root.crt -subj /C=US/ST=State/L=City/O=RootCA/OU=Unit/CN=localhost/emailAddress=none@nowhere.com
+	openssl req -config tests/openssl.cnf -extensions v3_ca -outform PEM -new -x509 -days 7 -key .testcerts/root.key -nodes -out .testcerts/root.crt -subj /C=US/ST=State/L=City/O=RootCA/OU=Unit/CN=localhost/emailAddress=none@nowhere.com
 	openssl genrsa -out .testcerts/intermediate1.key 4096
-	openssl req -new -key .testcerts/intermediate1.key -out .testcerts/intermediate1.csr -subj /C=US/ST=State/L=City/O=FirstIntermediate/OU=Unit/CN=localhost/emailAddress=none@nowhere.com
-	openssl x509 -req -days 7 -in .testcerts/intermediate1.csr -out .testcerts/intermediate1.crt -CAkey .testcerts/root.key -CA .testcerts/root.crt -CAserial .testcerts/serial
+	openssl req -config tests/openssl.cnf -extensions v3_ca -new -key .testcerts/intermediate1.key -out .testcerts/intermediate1.csr -subj /C=US/ST=State/L=City/O=FirstIntermediate/OU=Unit/CN=localhost/emailAddress=none@nowhere.com
+	openssl x509 -extfile tests/openssl.cnf -extensions v3_ca -outform PEM -req -days 7 -in .testcerts/intermediate1.csr -out .testcerts/intermediate1.crt -CAkey .testcerts/root.key -CA .testcerts/root.crt -CAserial .testcerts/serial
 	openssl genrsa -out .testcerts/intermediate2.key 4096
-	openssl req -new -key .testcerts/intermediate2.key -out .testcerts/intermediate2.csr -subj /C=US/ST=State/L=City/O=SecondIntermediate/OU=Unit/CN=localhost/emailAddress=none@nowhere.com
-	openssl x509 -req -days 7 -in .testcerts/intermediate2.csr -out .testcerts/intermediate2.crt -CAkey .testcerts/intermediate1.key -CA .testcerts/intermediate1.crt -CAserial .testcerts/serial
+	openssl req -config tests/openssl.cnf -extensions v3_ca -new -key .testcerts/intermediate2.key -out .testcerts/intermediate2.csr -subj /C=US/ST=State/L=City/O=SecondIntermediate/OU=Unit/CN=localhost/emailAddress=none@nowhere.com
+	openssl x509 -extfile tests/openssl.cnf -extensions v3_ca  -outform PEM -req -days 7 -in .testcerts/intermediate2.csr -out .testcerts/intermediate2.crt -CAkey .testcerts/intermediate1.key -CA .testcerts/intermediate1.crt -CAserial .testcerts/serial
 	openssl genrsa -out .testcerts/server.key 4096
 	openssl req -new -key .testcerts/server.key -out .testcerts/server.csr -subj /C=US/ST=State/L=City/O=Server/OU=Unit/CN=localhost/emailAddress=none@nowhere.com
-	openssl x509 -req -days 7 -in .testcerts/server.csr -out .testcerts/server.crt -CAkey .testcerts/intermediate2.key -CA .testcerts/intermediate2.crt -CAserial .testcerts/serial
+	openssl x509 -outform PEM -req -days 7 -in .testcerts/server.csr -out .testcerts/server.crt -CAkey .testcerts/intermediate2.key -CA .testcerts/intermediate2.crt -CAserial .testcerts/serial
 	cat .testcerts/intermediate1.crt .testcerts/intermediate2.crt > .testcerts/intermediates.crt
 }
 
 teardown () {
-    [ -f .server.pid ] && [ -d "/proc/$$(cat .server.pid)" ] && kill "$(cat .server.pid)" || true
-    #git clean -fdX
+    kill "$(cat .server.pid)" || true
+    git clean -fdX
 }
 
 server_test () {
diff --git a/tests/openssl.cnf b/tests/openssl.cnf
new file mode 100644
index 0000000..4507ba3
--- /dev/null
+++ b/tests/openssl.cnf
@@ -0,0 +1,8 @@
+[ req ]
+distinguished_name = req_distinguished_name
+
+[ req_distinguished_name]
+
+[ v3_ca ]
+basicConstraints = critical, CA:true
+keyUsage = keyCertSign, cRLSign
-- 
GitLab