From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 3 Jan 2019 23:17:25 +0000 (+0000)
Subject: Include all keys in dist
X-Git-Tag: v8.00~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=82e927a64bd124428fc7031c32d27b4ea3670d0f;p=users%2Fdwmw2%2Fopenconnect.git

Include all keys in dist

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6003d124..4db1a658 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,20 +11,23 @@ USER_KEYS = \
 	$(certsdir)/user-key-aes256-cbc-sha256.p12
 
 # We know GnuTLS doesn't support these for now. https://bugzilla.redhat.com/1369484
+OSSL_KEYS = \
+	$(certsdir)/user-key-md5-des-sha1.p12 $(certsdir)/user-key-aes256-cbc-md5-des-sha256.p12 \
+	$(certsdir)/user-key-pkcs8-pbes2-sha256.pem $(certsdir)/user-key-pkcs8-pbes2-sha256.der \
+	$(certsdir)/user-key-pkcs8-pbes1-md5-des.pem $(certsdir)/user-key-pkcs8-pbes1-md5-des.der
 if OPENCONNECT_OPENSSL
-USER_KEYS += $(certsdir)/user-key-md5-des-sha1.p12
-USER_KEYS += $(certsdir)/user-key-aes256-cbc-md5-des-sha256.p12
-USER_KEYS += $(certsdir)/user-key-pkcs8-pbes2-sha256.pem $(certsdir)/user-key-pkcs8-pbes2-sha256.der
-USER_KEYS += $(certsdir)/user-key-pkcs8-pbes1-md5-des.pem $(certsdir)/user-key-pkcs8-pbes1-md5-des.der
-endif # OPENCONNECT_OPENSSL
+USER_KEYS += $(OSSL_KEYS)
+endif
 
-if TEST_DSA
-USER_KEYS += $(certsdir)/dsa-key-pkcs1.pem $(certsdir)/dsa-key-pkcs1.der \
+DSA_KEYS = \
+	$(certsdir)/dsa-key-pkcs1.pem $(certsdir)/dsa-key-pkcs1.der \
 	$(certsdir)/dsa-key-pkcs1-aes128.pem \
 	$(certsdir)/dsa-key-pkcs8.pem $(certsdir)/dsa-key-pkcs8.der \
 	$(certsdir)/dsa-key-pkcs8-pbes2-sha1.pem $(certsdir)/dsa-key-pkcs8-pbes2-sha1.der \
 	$(certsdir)/dsa-key-aes256-cbc-sha256.p12
-endif # TEST_DSA
+if TEST_DSA
+USER_KEYS += $(DSA_KEYS)
+endif
 
 USER_KEYS += $(certsdir)/ec-key-pkcs1.pem $(certsdir)/ec-key-pkcs1.der \
 	$(certsdir)/ec-key-pkcs1-aes128.pem \
@@ -35,6 +38,8 @@ USER_KEYS += $(certsdir)/ec-key-pkcs1.pem $(certsdir)/ec-key-pkcs1.der \
 USER_CERTS = $(certsdir)/user-cert.pem $(certsdir)/dsa-cert.pem $(certsdir)/ec-cert.pem
 
 EXTRA_DIST = certs/ca.pem certs/ca-key.pem certs/user-cert.pem $(USER_KEYS) $(USER_CERTS) \
+	$(OSSL_KEYS) $(DSA_KEYS) $(certsdir)/user-key-nonascii-password.p12 \
+	pass-UTF-8 pass-ISO8859-2 pass-CP852 \
 	certs/server-cert.pem certs/server-key.pem configs/test1.passwd \
 	common.sh configs/test-user-cert.config configs/test-user-pass.config \
 	configs/user-cert.prm softhsm2.conf.in softhsm ns.sh configs/test-dtls-psk.config \