Use OUTPUT_DIR in rlm_crl tests for certs and crls

diff --git a/src/tests/modules/crl/module.conf b/src/tests/modules/crl/module.conf
index 07325fceb70eeeed95257b16d72bbad0c2964315..6a5d34e57c10778fbed988dabb31c98ee2d91a4e 100644 (file)
--- a/src/tests/modules/crl/module.conf
+++ b/src/tests/modules/crl/module.conf
@@ -1,7 +1,7 @@
 crl {
        source {
                dynamic {
-                       http = %file.cat("$ENV{MODULE_TEST_DIR}/ca.crl", 16384)
+                       http = %file.cat("$ENV{OUTPUT_DIR}/ca.crl", 16384)
                }
        }
        ca_file = raddb/certs/rsa/ca.pem
@@ -12,13 +12,13 @@ crl {
 linelog cacnf {
        destination = file
        file {
-               filename = "$ENV{MODULE_TEST_DIR}/ca%{clientno}.cnf"
+               filename = "$ENV{OUTPUT_DIR}/ca%{clientno}.cnf"
        }
 }
 
 linelog clientcnf {
        destination = file
        file {
-               filename = "$ENV{MODULE_TEST_DIR}/client%{clientno}.cnf"
+               filename = "$ENV{OUTPUT_DIR}/client%{clientno}.cnf"
        }
 }

diff --git a/src/tests/modules/crl/policy.conf b/src/tests/modules/crl/policy.conf
index edd55301a332284fcb246d0c5507b2948bbd3677..1685d810f12e074eb46825139d99f5869fda4ba0 100644 (file)
--- a/src/tests/modules/crl/policy.conf
+++ b/src/tests/modules/crl/policy.conf
@@ -8,11 +8,11 @@ prepare_cnf {
        cnf = %file.cat("$ENV{top_srcdir}raddb/certs/client.cnf", 16384)
        cnf := %str.subst(cnf, 'user', "user%{clientno}")
        cnf := %str.subst(cnf, ' ./', " $ENV{top_srcdir}raddb/certs/")
-       %file.rm("$ENV{MODULE_TEST_DIR}/client%{clientno}.cnf")
+       %file.rm("$ENV{OUTPUT_DIR}/client%{clientno}.cnf")
 
        %clientcnf(cnf)
        cnf = %file.cat("$ENV{top_srcdir}raddb/certs/ca.cnf", 16384)
-       %file.rm("$ENV{MODULE_TEST_DIR}/ca%{clientno}.cnf")
+       %file.rm("$ENV{OUTPUT_DIR}/ca%{clientno}.cnf")
        %cacnf(cnf)
 }
 
@@ -20,23 +20,23 @@ prepare_cnf {
 #  Create a client cert
 #
 create_client_cert {
-       %exec('/usr/bin/openssl', 'req', '-new', '-out', "$ENV{MODULE_TEST_DIR}/client%{clientno}.csr", '-keyout', "$ENV{MODULE_TEST_DIR}/client%{clientno}.key", '-config', "$ENV{MODULE_TEST_DIR}/client%{clientno}.cnf")
-       %exec('/usr/bin/openssl', 'ca', '-batch', '-keyfile', "$ENV{top_srcdir}raddb/certs/rsa/ca.key", '-cert', "$ENV{top_srcdir}raddb/certs/rsa/ca.pem", '-in', "$ENV{MODULE_TEST_DIR}/client%{clientno}.csr", '-key', 'whatever', '-out', "$ENV{MODULE_TEST_DIR}/client%{clientno}.crt", '-config', "$ENV{MODULE_TEST_DIR}/client%{clientno}.cnf")
+       %exec('/usr/bin/openssl', 'req', '-new', '-out', "$ENV{OUTPUT_DIR}/client%{clientno}.csr", '-keyout', "$ENV{OUTPUT_DIR}/client%{clientno}.key", '-config', "$ENV{OUTPUT_DIR}/client%{clientno}.cnf")
+       %exec('/usr/bin/openssl', 'ca', '-batch', '-keyfile', "$ENV{top_srcdir}raddb/certs/rsa/ca.key", '-cert', "$ENV{top_srcdir}raddb/certs/rsa/ca.pem", '-in', "$ENV{OUTPUT_DIR}/client%{clientno}.csr", '-key', 'whatever', '-out', "$ENV{OUTPUT_DIR}/client%{clientno}.crt", '-config', "$ENV{OUTPUT_DIR}/client%{clientno}.cnf")
 }
 
 #
 #  Revoke a client cert
 #
 revoke_client_cert {
-       %exec('/usr/bin/openssl', 'ca', '-config', "$ENV{MODULE_TEST_DIR}/ca%{clientno}.cnf", '-batch', '-revoke', "$ENV{MODULE_TEST_DIR}/client%{clientno}.crt", '-keyfile', "$ENV{top_srcdir}raddb/certs/rsa/ca.key", '-cert', "$ENV{top_srcdir}raddb/certs/rsa/ca.pem", '-passin', 'pass:whatever')
+       %exec('/usr/bin/openssl', 'ca', '-config', "$ENV{OUTPUT_DIR}/ca%{clientno}.cnf", '-batch', '-revoke', "$ENV{OUTPUT_DIR}/client%{clientno}.crt", '-keyfile', "$ENV{top_srcdir}raddb/certs/rsa/ca.key", '-cert', "$ENV{top_srcdir}raddb/certs/rsa/ca.pem", '-passin', 'pass:whatever')
 }
 
 #
 #  Build the CRL
 #
 build_crl {
-       %exec('/usr/bin/openssl', 'ca', '-gencrl', '-keyfile', "$ENV{top_srcdir}raddb/certs/rsa/ca.key", '-cert', "$ENV{top_srcdir}raddb/certs/rsa/ca.pem", '-config', "$ENV{MODULE_TEST_DIR}/ca%{clientno}.cnf", '-out', "$ENV{MODULE_TEST_DIR}/ca-crl.pem", '-key', 'whatever')
-       %exec('/usr/bin/openssl', 'crl', '-in', "$ENV{MODULE_TEST_DIR}/ca-crl.pem", '-outform', 'DER', '-out', "$ENV{MODULE_TEST_DIR}/ca.crl")
+       %exec('/usr/bin/openssl', 'ca', '-gencrl', '-keyfile', "$ENV{top_srcdir}raddb/certs/rsa/ca.key", '-cert', "$ENV{top_srcdir}raddb/certs/rsa/ca.pem", '-config', "$ENV{OUTPUT_DIR}/ca%{clientno}.cnf", '-out', "$ENV{OUTPUT_DIR}/ca-crl.pem", '-key', 'whatever')
+       %exec('/usr/bin/openssl', 'crl', '-in', "$ENV{OUTPUT_DIR}/ca-crl.pem", '-outform', 'DER', '-out', "$ENV{OUTPUT_DIR}/ca.crl")
 }
 
 #
@@ -47,7 +47,7 @@ build_crl {
 #   - the length (in bytes)
 #
 read_cert_serial {
-       serial := %exec('/usr/bin/openssl', 'x509', '-in', "$ENV{MODULE_TEST_DIR}/client%{clientno}.crt", '-serial', '-noout')
+       serial := %exec('/usr/bin/openssl', 'x509', '-in', "$ENV{OUTPUT_DIR}/client%{clientno}.crt", '-serial', '-noout')
        serial := %substr(serial, 7)
        len = %length(serial) / 2
        serial := '02' + %hex(len) + serial