v6-0003-squash-squash-test-ssl-rework-the-sslfiles-Makefi.patch

From 70e35a05649784ad427873f9ea8289ed8d924dcf Mon Sep 17 00:00:00 2001
From: Jacob Champion <pchampion@vmware.com>
Date: Wed, 8 Sep 2021 12:26:01 -0700
Subject: [PATCH v6 3/3] squash! squash! test/ssl: rework the sslfiles Makefile
 target

Move all configuration files underneath the conf/ directory.
---
 src/test/ssl/{ => conf}/cas.config            |  0
 src/test/ssl/{ => conf}/client-dn.config      |  0
 src/test/ssl/{ => conf}/client-revoked.config |  0
 src/test/ssl/{ => conf}/client.config         |  0
 src/test/ssl/{ => conf}/client_ca.config      |  0
 src/test/ssl/{ => conf}/root_ca.config        |  0
 .../{ => conf}/server-cn-and-alt-names.config |  0
 src/test/ssl/{ => conf}/server-cn-only.config |  0
 .../server-multiple-alt-names.config          |  0
 .../ssl/{ => conf}/server-no-names.config     |  0
 src/test/ssl/{ => conf}/server-revoked.config |  0
 .../{ => conf}/server-single-alt-name.config  |  0
 src/test/ssl/{ => conf}/server_ca.config      |  0
 src/test/ssl/sslfiles.mk                      | 32 +++++++++----------
 14 files changed, 16 insertions(+), 16 deletions(-)
 rename src/test/ssl/{ => conf}/cas.config (100%)
 rename src/test/ssl/{ => conf}/client-dn.config (100%)
 rename src/test/ssl/{ => conf}/client-revoked.config (100%)
 rename src/test/ssl/{ => conf}/client.config (100%)
 rename src/test/ssl/{ => conf}/client_ca.config (100%)
 rename src/test/ssl/{ => conf}/root_ca.config (100%)
 rename src/test/ssl/{ => conf}/server-cn-and-alt-names.config (100%)
 rename src/test/ssl/{ => conf}/server-cn-only.config (100%)
 rename src/test/ssl/{ => conf}/server-multiple-alt-names.config (100%)
 rename src/test/ssl/{ => conf}/server-no-names.config (100%)
 rename src/test/ssl/{ => conf}/server-revoked.config (100%)
 rename src/test/ssl/{ => conf}/server-single-alt-name.config (100%)
 rename src/test/ssl/{ => conf}/server_ca.config (100%)

diff --git a/src/test/ssl/cas.config b/src/test/ssl/conf/cas.config
similarity index 100%
rename from src/test/ssl/cas.config
rename to src/test/ssl/conf/cas.config
diff --git a/src/test/ssl/client-dn.config b/src/test/ssl/conf/client-dn.config
similarity index 100%
rename from src/test/ssl/client-dn.config
rename to src/test/ssl/conf/client-dn.config
diff --git a/src/test/ssl/client-revoked.config b/src/test/ssl/conf/client-revoked.config
similarity index 100%
rename from src/test/ssl/client-revoked.config
rename to src/test/ssl/conf/client-revoked.config
diff --git a/src/test/ssl/client.config b/src/test/ssl/conf/client.config
similarity index 100%
rename from src/test/ssl/client.config
rename to src/test/ssl/conf/client.config
diff --git a/src/test/ssl/client_ca.config b/src/test/ssl/conf/client_ca.config
similarity index 100%
rename from src/test/ssl/client_ca.config
rename to src/test/ssl/conf/client_ca.config
diff --git a/src/test/ssl/root_ca.config b/src/test/ssl/conf/root_ca.config
similarity index 100%
rename from src/test/ssl/root_ca.config
rename to src/test/ssl/conf/root_ca.config
diff --git a/src/test/ssl/server-cn-and-alt-names.config b/src/test/ssl/conf/server-cn-and-alt-names.config
similarity index 100%
rename from src/test/ssl/server-cn-and-alt-names.config
rename to src/test/ssl/conf/server-cn-and-alt-names.config
diff --git a/src/test/ssl/server-cn-only.config b/src/test/ssl/conf/server-cn-only.config
similarity index 100%
rename from src/test/ssl/server-cn-only.config
rename to src/test/ssl/conf/server-cn-only.config
diff --git a/src/test/ssl/server-multiple-alt-names.config b/src/test/ssl/conf/server-multiple-alt-names.config
similarity index 100%
rename from src/test/ssl/server-multiple-alt-names.config
rename to src/test/ssl/conf/server-multiple-alt-names.config
diff --git a/src/test/ssl/server-no-names.config b/src/test/ssl/conf/server-no-names.config
similarity index 100%
rename from src/test/ssl/server-no-names.config
rename to src/test/ssl/conf/server-no-names.config
diff --git a/src/test/ssl/server-revoked.config b/src/test/ssl/conf/server-revoked.config
similarity index 100%
rename from src/test/ssl/server-revoked.config
rename to src/test/ssl/conf/server-revoked.config
diff --git a/src/test/ssl/server-single-alt-name.config b/src/test/ssl/conf/server-single-alt-name.config
similarity index 100%
rename from src/test/ssl/server-single-alt-name.config
rename to src/test/ssl/conf/server-single-alt-name.config
diff --git a/src/test/ssl/server_ca.config b/src/test/ssl/conf/server_ca.config
similarity index 100%
rename from src/test/ssl/server_ca.config
rename to src/test/ssl/conf/server_ca.config
diff --git a/src/test/ssl/sslfiles.mk b/src/test/ssl/sslfiles.mk
index f3f0d1f8c0..b2ac7986e8 100644
--- a/src/test/ssl/sslfiles.mk
+++ b/src/test/ssl/sslfiles.mk
@@ -18,7 +18,7 @@
 
 #
 # To add a new server or client certificate, add a new <name>.config file in
-# this directory, then add <name> to either SERVERS or CLIENTS below. A
+# the conf/ directory, then add <name> to either SERVERS or CLIENTS below. A
 # key/certificate pair will be generated for you, signed by the appropriate CA.
 #
 SERVERS := server-cn-and-alt-names \
@@ -64,8 +64,8 @@ sslfiles: $(SSLFILES) $(SSLDIRS)
 #
 
 # Root CA is self-signed.
-ssl/root_ca.crt: ssl/root_ca.key root_ca.config
-	openssl req -new -x509 -config root_ca.config -days 10000 -key $< -out $@
+ssl/root_ca.crt: ssl/root_ca.key conf/root_ca.config
+	openssl req -new -x509 -config conf/root_ca.config -days 10000 -key $< -out $@
 
 #
 # Special-case keys
@@ -143,19 +143,19 @@ client_ca_state_files := ssl/client_ca-certindex ssl/client_ca-certindex.attr ss
 # These are the workhorse recipes. `openssl ca` can't be safely run from
 # parallel processes, so we must mark the entire Makefile .NOTPARALLEL.
 .NOTPARALLEL:
-$(CA_CERTS): ssl/%.crt: ssl/%.csr %.config cas.config ssl/root_ca.crt | ssl/new_certs_dir $(root_ca_state_files)
-	openssl ca -batch -config cas.config -name root_ca   -notext -in $< -out $@
+$(CA_CERTS): ssl/%.crt: ssl/%.csr conf/%.config conf/cas.config ssl/root_ca.crt | ssl/new_certs_dir $(root_ca_state_files)
+	openssl ca -batch -config conf/cas.config -name root_ca   -notext -in $< -out $@
 
-$(SERVER_CERTS): ssl/%.crt: ssl/%.csr %.config cas.config ssl/server_ca.crt | ssl/new_certs_dir $(server_ca_state_files)
-	openssl ca -batch -config cas.config -name server_ca -notext -in $< -out $@
+$(SERVER_CERTS): ssl/%.crt: ssl/%.csr conf/%.config conf/cas.config ssl/server_ca.crt | ssl/new_certs_dir $(server_ca_state_files)
+	openssl ca -batch -config conf/cas.config -name server_ca -notext -in $< -out $@
 
-$(CLIENT_CERTS): ssl/%.crt: ssl/%.csr %.config cas.config ssl/client_ca.crt | ssl/new_certs_dir $(client_ca_state_files)
-	openssl ca -batch -config cas.config -name client_ca -notext -in $< -out $@
+$(CLIENT_CERTS): ssl/%.crt: ssl/%.csr conf/%.config conf/cas.config ssl/client_ca.crt | ssl/new_certs_dir $(client_ca_state_files)
+	openssl ca -batch -config conf/cas.config -name client_ca -notext -in $< -out $@
 
 # The CSRs don't need to persist after a build.
 .INTERMEDIATE: $(CERTIFICATES:%=ssl/%.csr)
-ssl/%.csr: ssl/%.key %.config
-	openssl req -new -key $< -out $@ -config $*.config
+ssl/%.csr: ssl/%.key conf/%.config
+	openssl req -new -key $< -out $@ -config conf/$*.config
 
 #
 # CA State
@@ -189,15 +189,15 @@ ssl/%.srl:
 #
 
 ssl/root.crl: ssl/root_ca.crt | $(root_ca_state_files)
-	openssl ca -config cas.config -name root_ca   -gencrl -out $@
+	openssl ca -config conf/cas.config -name root_ca   -gencrl -out $@
 
 ssl/server.crl: ssl/server-revoked.crt ssl/server_ca.crt | $(server_ca_state_files)
-	openssl ca -config cas.config -name server_ca -revoke $<
-	openssl ca -config cas.config -name server_ca -gencrl -out $@
+	openssl ca -config conf/cas.config -name server_ca -revoke $<
+	openssl ca -config conf/cas.config -name server_ca -gencrl -out $@
 
 ssl/client.crl: ssl/client-revoked.crt ssl/client_ca.crt | $(client_ca_state_files)
-	openssl ca -config cas.config -name client_ca -revoke $<
-	openssl ca -config cas.config -name client_ca -gencrl -out $@
+	openssl ca -config conf/cas.config -name client_ca -revoke $<
+	openssl ca -config conf/cas.config -name client_ca -gencrl -out $@
 
 #
 # CRL hash directories
-- 
2.25.1