From 4669ba5e0c25b4ea7c3288f866d71c7d3689d473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20R=C3=BChsen?= Date: Tue, 9 May 2017 16:04:48 +0200 Subject: [PATCH] Auto-generate interca.conf and rootca.conf * configure.ac: Add interca.conf.in and rootca.conf.in to AC_CONFIG_FILES * tests/certs/interca.conf: Removed * tests/certs/rootca.conf: Removed * tests/certs/interca.conf.in: New file * tests/certs/rootca.conf.in: New file --- configure.ac | 3 ++- tests/certs/{interca.conf => interca.conf.in} | 2 +- tests/certs/{rootca.conf => rootca.conf.in} | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename tests/certs/{interca.conf => interca.conf.in} (98%) rename tests/certs/{rootca.conf => rootca.conf.in} (98%) diff --git a/configure.ac b/configure.ac index 5ab6184c..13debe22 100644 --- a/configure.ac +++ b/configure.ac @@ -784,7 +784,8 @@ dnl Create output dnl AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile util/Makefile po/Makefile.in tests/Makefile - lib/Makefile testenv/Makefile]) + lib/Makefile testenv/Makefile + tests/certs/interca.conf tests/certs/rootca.conf]) AC_CONFIG_HEADERS([src/config.h]) AC_OUTPUT diff --git a/tests/certs/interca.conf b/tests/certs/interca.conf.in similarity index 98% rename from tests/certs/interca.conf rename to tests/certs/interca.conf.in index f5cd0c3c..5bf28fd7 100644 --- a/tests/certs/interca.conf +++ b/tests/certs/interca.conf.in @@ -6,7 +6,7 @@ issuerAltName=issuer:copy authorityKeyIdentifier=keyid:always [ myca ] - dir = ./certs/ + dir = @abs_srcdir@ new_certs_dir = ./ unique_subject = no certificate = interca.crt diff --git a/tests/certs/rootca.conf b/tests/certs/rootca.conf.in similarity index 98% rename from tests/certs/rootca.conf rename to tests/certs/rootca.conf.in index 49836941..ab6e8af3 100644 --- a/tests/certs/rootca.conf +++ b/tests/certs/rootca.conf.in @@ -6,7 +6,7 @@ issuerAltName=issuer:copy authorityKeyIdentifier=keyid:always [ myca ] - dir = ./certs/ + dir = @abs_srcdir@ new_certs_dir = ./ unique_subject = no certificate = $dir/test-ca-cert.pem