From: Martin Willi Date: Mon, 20 Dec 2010 14:50:05 +0000 (+0100) Subject: Use paths relative to suite config X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25fa2fb37495658ea9c338162503450c16e99fb2;p=thirdparty%2Fstrongswan.git Use paths relative to suite config --- diff --git a/src/conftest/suiteb/11.1.1/test.conf b/src/conftest/suiteb/11.1.1/test.conf index e3dc6f3bbf..273099f7ac 100644 --- a/src/conftest/suiteb/11.1.1/test.conf +++ b/src/conftest/suiteb/11.1.1/test.conf @@ -29,7 +29,7 @@ configs { certs { untrusted { - x509-wrong-swan = ../ls-wrong-san.crt + x509-wrong-san = ls-wrong-san.crt } } diff --git a/src/conftest/suiteb/11.1.2/test.conf b/src/conftest/suiteb/11.1.2/test.conf index 43ee71506c..3d410cdbf8 100644 --- a/src/conftest/suiteb/11.1.2/test.conf +++ b/src/conftest/suiteb/11.1.2/test.conf @@ -29,7 +29,7 @@ configs { certs { untrusted { - x509-wrong-swan = ../ls-wrong-san.crt + x509-wrong-san = ls-wrong-san.crt } } diff --git a/src/conftest/suiteb/11.1.3/test.conf b/src/conftest/suiteb/11.1.3/test.conf index c48f9a021c..5adab0455f 100644 --- a/src/conftest/suiteb/11.1.3/test.conf +++ b/src/conftest/suiteb/11.1.3/test.conf @@ -29,7 +29,7 @@ configs { certs { untrusted { - x509-wrong-san = ../ls-wrong-san.crt + x509-wrong-san = ls-wrong-san.crt } } diff --git a/src/conftest/suiteb/11.3.1/test.conf b/src/conftest/suiteb/11.3.1/test.conf index 62776fdfe9..7cbb2a56b2 100644 --- a/src/conftest/suiteb/11.3.1/test.conf +++ b/src/conftest/suiteb/11.3.1/test.conf @@ -15,12 +15,12 @@ configs { certs { untrusted { - x509-ls-rsa = ../ls-rsa.crt + x509-ls-rsa = ls-rsa.crt } } keys { - rsa-ls = ../ls-rsa.key + rsa-ls = ls-rsa.key } diff --git a/src/conftest/suiteb/11.3.2/test.conf b/src/conftest/suiteb/11.3.2/test.conf index e117baffc1..68c35b88c4 100644 --- a/src/conftest/suiteb/11.3.2/test.conf +++ b/src/conftest/suiteb/11.3.2/test.conf @@ -15,7 +15,7 @@ configs { certs { untrusted { - x509-ls-icarsa = ../ls-icarsa.crt + x509-ls-icarsa = ls-icarsa.crt } } diff --git a/src/conftest/suiteb/11.4.2/test.conf b/src/conftest/suiteb/11.4.2/test.conf index 32312c059f..e28455757f 100644 --- a/src/conftest/suiteb/11.4.2/test.conf +++ b/src/conftest/suiteb/11.4.2/test.conf @@ -15,12 +15,12 @@ configs { certs { untrusted { - x509-ls-256-256 = ../ls-256-256.crt + x509-ls-256-256 = ls-256-256.crt } } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key } diff --git a/src/conftest/suiteb/11.4.3/test.conf b/src/conftest/suiteb/11.4.3/test.conf index 3b028149e6..ba27767228 100644 --- a/src/conftest/suiteb/11.4.3/test.conf +++ b/src/conftest/suiteb/11.4.3/test.conf @@ -15,12 +15,12 @@ configs { certs { untrusted { - x509-ls-256-384 = ../ls-256-384.crt + x509-ls-256-384 = ls-256-384.crt } } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key } diff --git a/src/conftest/suiteb/11.5.1/test.conf b/src/conftest/suiteb/11.5.1/test.conf index 9c8e4237bc..4cdbf697b3 100644 --- a/src/conftest/suiteb/11.5.1/test.conf +++ b/src/conftest/suiteb/11.5.1/test.conf @@ -16,7 +16,7 @@ configs { certs { untrusted { - x509-ls-384-256 = ../ls-384-256.crt + x509-ls-384-256 = ls-384-256.crt } } diff --git a/src/conftest/suiteb/11.5.2/test.conf b/src/conftest/suiteb/11.5.2/test.conf index 4f4e606f7a..530766b2fd 100644 --- a/src/conftest/suiteb/11.5.2/test.conf +++ b/src/conftest/suiteb/11.5.2/test.conf @@ -16,7 +16,7 @@ configs { certs { untrusted { - x509-ls-icalowhigh = ../ls-icalowhigh.crt + x509-ls-icalowhigh = ls-icalowhigh.crt } } diff --git a/src/conftest/suiteb/11.6.1/dut.conf b/src/conftest/suiteb/11.6.1/dut.conf index 6f5fe09e9c..e039b79b00 100644 --- a/src/conftest/suiteb/11.6.1/dut.conf +++ b/src/conftest/suiteb/11.6.1/dut.conf @@ -1,7 +1,7 @@ certs { untrusted { - crl = ../revRSA.crl + crl = revRSA.crl } } diff --git a/src/conftest/suiteb/11.6.1/test.conf b/src/conftest/suiteb/11.6.1/test.conf index f49c4071a0..ba4fda3614 100644 --- a/src/conftest/suiteb/11.6.1/test.conf +++ b/src/conftest/suiteb/11.6.1/test.conf @@ -1,12 +1,12 @@ certs { untrusted { - x509-ls-256-revRSA = ../ls-256-revRSA.crt + x509-ls-256-revRSA = ls-256-revRSA.crt } } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key } configs { diff --git a/src/conftest/suiteb/11.7.1/dut.conf b/src/conftest/suiteb/11.7.1/dut.conf index 2092ce86ad..5ab414fa54 100644 --- a/src/conftest/suiteb/11.7.1/dut.conf +++ b/src/conftest/suiteb/11.7.1/dut.conf @@ -1,7 +1,7 @@ certs { untrusted { - crl = ../revRSA.crl + crl = revRSA.crl } } diff --git a/src/conftest/suiteb/11.7.1/test.conf b/src/conftest/suiteb/11.7.1/test.conf index ece6409488..bd26a423b2 100644 --- a/src/conftest/suiteb/11.7.1/test.conf +++ b/src/conftest/suiteb/11.7.1/test.conf @@ -1,7 +1,7 @@ certs { untrusted { - x509-ls-revRSA = ../ls-revRSA.crt + x509-ls-revRSA = ls-revRSA.crt } } diff --git a/src/conftest/suiteb/11.7.2/dut.conf b/src/conftest/suiteb/11.7.2/dut.conf index 4977f5d29b..a7226af1cd 100644 --- a/src/conftest/suiteb/11.7.2/dut.conf +++ b/src/conftest/suiteb/11.7.2/dut.conf @@ -1,7 +1,7 @@ certs { untrusted { - crl = ../rev256.crl + crl = rev256.crl } } diff --git a/src/conftest/suiteb/11.7.2/test.conf b/src/conftest/suiteb/11.7.2/test.conf index 9dc7d7e5b5..2055e0fd2c 100644 --- a/src/conftest/suiteb/11.7.2/test.conf +++ b/src/conftest/suiteb/11.7.2/test.conf @@ -1,7 +1,7 @@ certs { untrusted { - x509-ls-rev256 = ../ls-rev256.crt + x509-ls-rev256 = ls-rev256.crt } } diff --git a/src/conftest/suiteb/13.1.1/dut.conf b/src/conftest/suiteb/13.1.1/dut.conf index 439d4828b2..6153ff8f4b 100644 --- a/src/conftest/suiteb/13.1.1/dut.conf +++ b/src/conftest/suiteb/13.1.1/dut.conf @@ -6,12 +6,12 @@ actions { } keys { - ecdsa-dut-256 = ../dut-256.key + ecdsa-dut-256 = dut-256.key } certs { untrusted { - x509-dut-256-384 = ../dut-256-384.crt + x509-dut-256-384 = dut-256-384.crt } } diff --git a/src/conftest/suiteb/13.1.1/test.conf b/src/conftest/suiteb/13.1.1/test.conf index dae126dd24..9646c36111 100644 --- a/src/conftest/suiteb/13.1.1/test.conf +++ b/src/conftest/suiteb/13.1.1/test.conf @@ -7,12 +7,12 @@ hooks { } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key } certs { untrusted { - x509-ls-256-384 = ../ls-256-384.crt + x509-ls-256-384 = ls-256-384.crt } } diff --git a/src/conftest/suiteb/13.1.3/test.conf b/src/conftest/suiteb/13.1.3/test.conf index 3c72b9d3f6..d709e69aaa 100644 --- a/src/conftest/suiteb/13.1.3/test.conf +++ b/src/conftest/suiteb/13.1.3/test.conf @@ -7,12 +7,12 @@ hooks { } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key } certs { untrusted { - x509-ls-256-384 = ../ls-256-384.crt + x509-ls-256-384 = ls-256-384.crt } } diff --git a/src/conftest/suiteb/13.1.4/dut.conf b/src/conftest/suiteb/13.1.4/dut.conf index 7887e76537..33ef4abd14 100644 --- a/src/conftest/suiteb/13.1.4/dut.conf +++ b/src/conftest/suiteb/13.1.4/dut.conf @@ -6,12 +6,12 @@ actions { } keys { - ecdsa-dut-256 = ../dut-256.key + ecdsa-dut-256 = dut-256.key } certs { untrusted { - x509-dut-256-384 = ../dut-256-384.crt + x509-dut-256-384 = dut-256-384.crt } } diff --git a/src/conftest/suiteb/13.2.1/dut.conf b/src/conftest/suiteb/13.2.1/dut.conf index cefa34b74a..82e1df1897 100644 --- a/src/conftest/suiteb/13.2.1/dut.conf +++ b/src/conftest/suiteb/13.2.1/dut.conf @@ -1,11 +1,11 @@ keys { - ecdsa-dut-256 = ../dut-256.key + ecdsa-dut-256 = dut-256.key } certs { untrusted { - x509-dut-256-384 = ../dut-256-384.crt + x509-dut-256-384 = dut-256-384.crt } } diff --git a/src/conftest/suiteb/13.2.1/test.conf b/src/conftest/suiteb/13.2.1/test.conf index 9ff65b46d7..fd8d471217 100644 --- a/src/conftest/suiteb/13.2.1/test.conf +++ b/src/conftest/suiteb/13.2.1/test.conf @@ -13,12 +13,12 @@ actions { } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key } certs { untrusted { - x509-ls-256-384 = ../ls-256-384.crt + x509-ls-256-384 = ls-256-384.crt } } diff --git a/src/conftest/suiteb/13.2.3/test.conf b/src/conftest/suiteb/13.2.3/test.conf index cdf4b6be05..12abbb6e3a 100644 --- a/src/conftest/suiteb/13.2.3/test.conf +++ b/src/conftest/suiteb/13.2.3/test.conf @@ -13,12 +13,12 @@ actions { } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key } certs { untrusted { - x509-ls-256-384 = ../ls-256-384.crt + x509-ls-256-384 = ls-256-384.crt } } diff --git a/src/conftest/suiteb/13.2.4/dut.conf b/src/conftest/suiteb/13.2.4/dut.conf index cdf1fdd8cc..63c4551133 100644 --- a/src/conftest/suiteb/13.2.4/dut.conf +++ b/src/conftest/suiteb/13.2.4/dut.conf @@ -1,11 +1,11 @@ keys { - ecdsa-dut-256 = ../dut-256.key + ecdsa-dut-256 = dut-256.key } certs { untrusted { - x509-dut-256-384 = ../dut-256-384.crt + x509-dut-256-384 = dut-256-384.crt } } diff --git a/src/conftest/suiteb/14.1.2/test.conf b/src/conftest/suiteb/14.1.2/test.conf index d91d9c0f7a..29ed3c3304 100644 --- a/src/conftest/suiteb/14.1.2/test.conf +++ b/src/conftest/suiteb/14.1.2/test.conf @@ -7,12 +7,12 @@ hooks { } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key } certs { untrusted { - x509-ls-256-384 = ../ls-256-384.crt + x509-ls-256-384 = ls-256-384.crt } } diff --git a/src/conftest/suiteb/14.2.2/test.conf b/src/conftest/suiteb/14.2.2/test.conf index 4e7137af58..b7ab27b041 100644 --- a/src/conftest/suiteb/14.2.2/test.conf +++ b/src/conftest/suiteb/14.2.2/test.conf @@ -13,12 +13,12 @@ actions { } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key } certs { untrusted { - x509-ls-256-384 = ../ls-256-384.crt + x509-ls-256-384 = ls-256-384.crt } } diff --git a/src/conftest/suiteb/15.1.1/dut.conf b/src/conftest/suiteb/15.1.1/dut.conf index 6605581147..08ad71d878 100644 --- a/src/conftest/suiteb/15.1.1/dut.conf +++ b/src/conftest/suiteb/15.1.1/dut.conf @@ -6,12 +6,12 @@ actions { } keys { - ecdsa-dut-256 = ../dut-256.key + ecdsa-dut-256 = dut-256.key } certs { untrusted { - x509-dut-256-384 = ../dut-256-384.crt + x509-dut-256-384 = dut-256-384.crt } } diff --git a/src/conftest/suiteb/15.1.1/test.conf b/src/conftest/suiteb/15.1.1/test.conf index 77f2df1607..ef554a9c5d 100644 --- a/src/conftest/suiteb/15.1.1/test.conf +++ b/src/conftest/suiteb/15.1.1/test.conf @@ -7,12 +7,12 @@ hooks { } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key } certs { untrusted { - x509-ls-256-384 = ../ls-256-384.crt + x509-ls-256-384 = ls-256-384.crt } } diff --git a/src/conftest/suiteb/15.1.3/test.conf b/src/conftest/suiteb/15.1.3/test.conf index 930999138e..1fdb2707ed 100644 --- a/src/conftest/suiteb/15.1.3/test.conf +++ b/src/conftest/suiteb/15.1.3/test.conf @@ -7,12 +7,12 @@ hooks { } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key } certs { untrusted { - x509-ls-256-384 = ../ls-256-384.crt + x509-ls-256-384 = ls-256-384.crt } } diff --git a/src/conftest/suiteb/15.1.4/dut.conf b/src/conftest/suiteb/15.1.4/dut.conf index c2347e0e70..f06563ce7d 100644 --- a/src/conftest/suiteb/15.1.4/dut.conf +++ b/src/conftest/suiteb/15.1.4/dut.conf @@ -6,12 +6,12 @@ actions { } keys { - ecdsa-dut-256 = ../dut-256.key + ecdsa-dut-256 = dut-256.key } certs { untrusted { - x509-dut-256-384 = ../dut-256-384.crt + x509-dut-256-384 = dut-256-384.crt } } diff --git a/src/conftest/suiteb/15.2.1/dut.conf b/src/conftest/suiteb/15.2.1/dut.conf index 2f62f90424..68e682fc9c 100644 --- a/src/conftest/suiteb/15.2.1/dut.conf +++ b/src/conftest/suiteb/15.2.1/dut.conf @@ -1,11 +1,11 @@ keys { - ecdsa-dut-256 = ../dut-256.key + ecdsa-dut-256 = dut-256.key } certs { untrusted { - x509-dut-256-384 = ../dut-256-384.crt + x509-dut-256-384 = dut-256-384.crt } } diff --git a/src/conftest/suiteb/15.2.1/test.conf b/src/conftest/suiteb/15.2.1/test.conf index 9c2657feb4..f73ed5b0fa 100644 --- a/src/conftest/suiteb/15.2.1/test.conf +++ b/src/conftest/suiteb/15.2.1/test.conf @@ -13,12 +13,12 @@ actions { } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key } certs { untrusted { - x509-ls-256-384 = ../ls-256-384.crt + x509-ls-256-384 = ls-256-384.crt } } diff --git a/src/conftest/suiteb/15.2.3/test.conf b/src/conftest/suiteb/15.2.3/test.conf index 74edf002d9..4af5f30520 100644 --- a/src/conftest/suiteb/15.2.3/test.conf +++ b/src/conftest/suiteb/15.2.3/test.conf @@ -13,12 +13,12 @@ actions { } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key } certs { untrusted { - x509-ls-256-384 = ../ls-256-384.crt + x509-ls-256-384 = ls-256-384.crt } } diff --git a/src/conftest/suiteb/15.2.4/dut.conf b/src/conftest/suiteb/15.2.4/dut.conf index cddfa4a37a..b9796d726e 100644 --- a/src/conftest/suiteb/15.2.4/dut.conf +++ b/src/conftest/suiteb/15.2.4/dut.conf @@ -1,11 +1,11 @@ keys { - ecdsa-dut-256 = ../dut-256.key + ecdsa-dut-256 = dut-256.key } certs { untrusted { - x509-dut-256-384 = ../dut-256-384.crt + x509-dut-256-384 = dut-256-384.crt } } diff --git a/src/conftest/suiteb/16.1.2/test.conf b/src/conftest/suiteb/16.1.2/test.conf index d91d9c0f7a..29ed3c3304 100644 --- a/src/conftest/suiteb/16.1.2/test.conf +++ b/src/conftest/suiteb/16.1.2/test.conf @@ -7,12 +7,12 @@ hooks { } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key } certs { untrusted { - x509-ls-256-384 = ../ls-256-384.crt + x509-ls-256-384 = ls-256-384.crt } } diff --git a/src/conftest/suiteb/16.2.2/test.conf b/src/conftest/suiteb/16.2.2/test.conf index 4e7137af58..b7ab27b041 100644 --- a/src/conftest/suiteb/16.2.2/test.conf +++ b/src/conftest/suiteb/16.2.2/test.conf @@ -13,12 +13,12 @@ actions { } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key } certs { untrusted { - x509-ls-256-384 = ../ls-256-384.crt + x509-ls-256-384 = ls-256-384.crt } } diff --git a/src/conftest/suiteb/20.1.1/test.conf b/src/conftest/suiteb/20.1.1/test.conf index d6fe33ccdc..a912643d2d 100644 --- a/src/conftest/suiteb/20.1.1/test.conf +++ b/src/conftest/suiteb/20.1.1/test.conf @@ -1,7 +1,7 @@ certs { untrusted { - x509-cft = cft.crt + x509-cft = 20.1.1/cft.crt } } diff --git a/src/conftest/suiteb/20.2.1/test.conf b/src/conftest/suiteb/20.2.1/test.conf index 25038b80d8..4acf4fc69b 100644 --- a/src/conftest/suiteb/20.2.1/test.conf +++ b/src/conftest/suiteb/20.2.1/test.conf @@ -1,7 +1,7 @@ certs { untrusted { - x509-cft = cft.crt + x509-cft = 20.2.1/cft.crt } } diff --git a/src/conftest/suiteb/21.2.1/test.conf b/src/conftest/suiteb/21.2.1/test.conf index d6486ecb86..d15877ca01 100644 --- a/src/conftest/suiteb/21.2.1/test.conf +++ b/src/conftest/suiteb/21.2.1/test.conf @@ -1,7 +1,7 @@ certs { untrusted { - x509-cft = cft.crt + x509-cft = 21.2.1/cft.crt } } diff --git a/src/conftest/suiteb/21.2.2/test.conf b/src/conftest/suiteb/21.2.2/test.conf index d410d049fe..e0430792d4 100644 --- a/src/conftest/suiteb/21.2.2/test.conf +++ b/src/conftest/suiteb/21.2.2/test.conf @@ -1,8 +1,8 @@ certs { untrusted { - x509-ca3 = ca3.crt - x509-cft = cft.crt + x509-ca3 = 21.2.2/ca3.crt + x509-cft = 21.2.2/cft.crt } } diff --git a/src/conftest/suiteb/21.3.1/test.conf b/src/conftest/suiteb/21.3.1/test.conf index 329692a06c..e8f21d106c 100644 --- a/src/conftest/suiteb/21.3.1/test.conf +++ b/src/conftest/suiteb/21.3.1/test.conf @@ -1,8 +1,8 @@ certs { untrusted { - x509-ca2 = ca2.crt - x509-cft = cft.crt + x509-ca2 = 21.3.1/ca2.crt + x509-cft = 21.3.1/cft.crt } } diff --git a/src/conftest/suiteb/21.3.2/test.conf b/src/conftest/suiteb/21.3.2/test.conf index 774881707e..b91f617a0f 100644 --- a/src/conftest/suiteb/21.3.2/test.conf +++ b/src/conftest/suiteb/21.3.2/test.conf @@ -1,8 +1,8 @@ certs { untrusted { - x509-ca2 = ca2.crt - x509-cft = cft.crt + x509-ca2 = 21.3.2/ca2.crt + x509-cft = 21.3.2/cft.crt } } diff --git a/src/conftest/suiteb/21.3.3/test.conf b/src/conftest/suiteb/21.3.3/test.conf index 5c71851f0b..eb36af91e0 100644 --- a/src/conftest/suiteb/21.3.3/test.conf +++ b/src/conftest/suiteb/21.3.3/test.conf @@ -1,9 +1,9 @@ certs { untrusted { - x509-ca2 = ca2.crt - x509-ca3 = ca3.crt - x509-cft = cft.crt + x509-ca2 = 21.3.3/ca2.crt + x509-ca3 = 21.3.3/ca3.crt + x509-cft = 21.3.3/cft.crt } } diff --git a/src/conftest/suiteb/21.4.1/test.conf b/src/conftest/suiteb/21.4.1/test.conf index 68e36138a3..04b04e6da7 100644 --- a/src/conftest/suiteb/21.4.1/test.conf +++ b/src/conftest/suiteb/21.4.1/test.conf @@ -1,8 +1,8 @@ certs { untrusted { - x509-ca2 = ca2.crt - x509-cft = cft.crt + x509-ca2 = 21.4.1/ca2.crt + x509-cft = 21.4.1/cft.crt } } diff --git a/src/conftest/suiteb/21.4.2/test.conf b/src/conftest/suiteb/21.4.2/test.conf index 331be14046..951dd8aa1d 100644 --- a/src/conftest/suiteb/21.4.2/test.conf +++ b/src/conftest/suiteb/21.4.2/test.conf @@ -1,9 +1,9 @@ certs { untrusted { - x509-ca2 = ca2.crt - x509-ca3 = ca3.crt - x509-cft = cft.crt + x509-ca2 = 21.4.2/ca2.crt + x509-ca3 = 21.4.2/ca3.crt + x509-cft = 21.4.2/cft.crt } } diff --git a/src/conftest/suiteb/21.5.1/test.conf b/src/conftest/suiteb/21.5.1/test.conf index 68e36138a3..0f71f5ff0c 100644 --- a/src/conftest/suiteb/21.5.1/test.conf +++ b/src/conftest/suiteb/21.5.1/test.conf @@ -1,8 +1,8 @@ certs { untrusted { - x509-ca2 = ca2.crt - x509-cft = cft.crt + x509-ca2 = 21.5.1/ca2.crt + x509-cft = 21.5.1/cft.crt } } diff --git a/src/conftest/suiteb/21.5.2/test.conf b/src/conftest/suiteb/21.5.2/test.conf index 331be14046..a05d670c3f 100644 --- a/src/conftest/suiteb/21.5.2/test.conf +++ b/src/conftest/suiteb/21.5.2/test.conf @@ -1,9 +1,9 @@ certs { untrusted { - x509-ca2 = ca2.crt - x509-ca3 = ca3.crt - x509-cft = cft.crt + x509-ca2 = 21.5.2/ca2.crt + x509-ca3 = 21.5.2/ca3.crt + x509-cft = 21.5.2/cft.crt } } diff --git a/src/conftest/suiteb/22.2.1/dut.conf b/src/conftest/suiteb/22.2.1/dut.conf index 5ad387e537..72a9d93423 100644 --- a/src/conftest/suiteb/22.2.1/dut.conf +++ b/src/conftest/suiteb/22.2.1/dut.conf @@ -1,7 +1,7 @@ certs { trusted { - x509-TApol1 = TApol1.crt + x509-TApol1 = 22.2.1/TApol1.crt } } diff --git a/src/conftest/suiteb/22.2.1/test.conf b/src/conftest/suiteb/22.2.1/test.conf index f7d97661e1..daee2c389c 100644 --- a/src/conftest/suiteb/22.2.1/test.conf +++ b/src/conftest/suiteb/22.2.1/test.conf @@ -1,10 +1,10 @@ certs { trusted { - x509-TApol1 = TApol1.crt + x509-TApol1 = 22.2.2/TApol1.crt } untrusted { - x509-cft = cft.crt + x509-cft = 22.2.2/cft.crt } } diff --git a/src/conftest/suiteb/22.2.2/dut.conf b/src/conftest/suiteb/22.2.2/dut.conf index 5ad387e537..568377b0db 100644 --- a/src/conftest/suiteb/22.2.2/dut.conf +++ b/src/conftest/suiteb/22.2.2/dut.conf @@ -1,7 +1,7 @@ certs { trusted { - x509-TApol1 = TApol1.crt + x509-TApol1 = 22.2.2/TApol1.crt } } diff --git a/src/conftest/suiteb/22.2.2/test.conf b/src/conftest/suiteb/22.2.2/test.conf index f7d97661e1..daee2c389c 100644 --- a/src/conftest/suiteb/22.2.2/test.conf +++ b/src/conftest/suiteb/22.2.2/test.conf @@ -1,10 +1,10 @@ certs { trusted { - x509-TApol1 = TApol1.crt + x509-TApol1 = 22.2.2/TApol1.crt } untrusted { - x509-cft = cft.crt + x509-cft = 22.2.2/cft.crt } } diff --git a/src/conftest/suiteb/22.2.3/dut.conf b/src/conftest/suiteb/22.2.3/dut.conf index 51957fafc4..043e48664f 100644 --- a/src/conftest/suiteb/22.2.3/dut.conf +++ b/src/conftest/suiteb/22.2.3/dut.conf @@ -1,7 +1,7 @@ certs { trusted { - x509-TApol1 = TApol1.crt + x509-TApol1 = 22.2.3/TApol1.crt } } diff --git a/src/conftest/suiteb/22.2.3/test.conf b/src/conftest/suiteb/22.2.3/test.conf index f7d97661e1..fba9b0ce90 100644 --- a/src/conftest/suiteb/22.2.3/test.conf +++ b/src/conftest/suiteb/22.2.3/test.conf @@ -1,10 +1,10 @@ certs { trusted { - x509-TApol1 = TApol1.crt + x509-TApol1 = 22.2.3/TApol1.crt } untrusted { - x509-cft = cft.crt + x509-cft = 22.2.3/cft.crt } } diff --git a/src/conftest/suiteb/22.3.1/dut.conf b/src/conftest/suiteb/22.3.1/dut.conf index 92efc0c6eb..7057992208 100644 --- a/src/conftest/suiteb/22.3.1/dut.conf +++ b/src/conftest/suiteb/22.3.1/dut.conf @@ -1,7 +1,7 @@ certs { trusted { - x509-ca1 = ca1.crt + x509-ca1 = 22.3.1/ca1.crt } } diff --git a/src/conftest/suiteb/22.3.1/test.conf b/src/conftest/suiteb/22.3.1/test.conf index 256e006142..03433e7b43 100644 --- a/src/conftest/suiteb/22.3.1/test.conf +++ b/src/conftest/suiteb/22.3.1/test.conf @@ -1,11 +1,11 @@ certs { trusted { - x509-ca1 = ca1.crt + x509-ca1 = 22.3.1/ca1.crt } untrusted { - x509-ca2 = ca2.crt - x509-cft = cft.crt + x509-ca2 = 22.3.1/ca2.crt + x509-cft = 22.3.1/cft.crt } } diff --git a/src/conftest/suiteb/22.3.2/dut.conf b/src/conftest/suiteb/22.3.2/dut.conf index 92efc0c6eb..f3a4661e71 100644 --- a/src/conftest/suiteb/22.3.2/dut.conf +++ b/src/conftest/suiteb/22.3.2/dut.conf @@ -1,7 +1,7 @@ certs { trusted { - x509-ca1 = ca1.crt + x509-ca1 = 22.3.2/ca1.crt } } diff --git a/src/conftest/suiteb/22.3.2/test.conf b/src/conftest/suiteb/22.3.2/test.conf index 256e006142..3c52dcd5d2 100644 --- a/src/conftest/suiteb/22.3.2/test.conf +++ b/src/conftest/suiteb/22.3.2/test.conf @@ -1,11 +1,11 @@ certs { trusted { - x509-ca1 = ca1.crt + x509-ca1 = 22.3.2/ca1.crt } untrusted { - x509-ca2 = ca2.crt - x509-cft = cft.crt + x509-ca2 = 22.3.2/ca2.crt + x509-cft = 22.3.2/cft.crt } } diff --git a/src/conftest/suiteb/3.10.1/test.conf b/src/conftest/suiteb/3.10.1/test.conf index f11f4981a1..acee0e01ac 100644 --- a/src/conftest/suiteb/3.10.1/test.conf +++ b/src/conftest/suiteb/3.10.1/test.conf @@ -1,7 +1,7 @@ certs { untrusted { - x509-ls-untrusted = ../ls-untrusted.crt + x509-ls-untrusted = ls-untrusted.crt } } diff --git a/src/conftest/suiteb/3.10.2/test.conf b/src/conftest/suiteb/3.10.2/test.conf index 367ed5684a..8a739af38f 100644 --- a/src/conftest/suiteb/3.10.2/test.conf +++ b/src/conftest/suiteb/3.10.2/test.conf @@ -1,7 +1,7 @@ certs { untrusted { - x509-ls-expired = ../ls-expired.crt + x509-ls-expired = ls-expired.crt } } diff --git a/src/conftest/suiteb/3.10.3/dut.conf b/src/conftest/suiteb/3.10.3/dut.conf index 1f7959af42..0f3104e761 100644 --- a/src/conftest/suiteb/3.10.3/dut.conf +++ b/src/conftest/suiteb/3.10.3/dut.conf @@ -1,7 +1,7 @@ certs { untrusted { - crl = ../TA384.crl + crl = TA384.crl } } diff --git a/src/conftest/suiteb/3.10.3/test.conf b/src/conftest/suiteb/3.10.3/test.conf index abcdb2bb5b..da4e894b5c 100644 --- a/src/conftest/suiteb/3.10.3/test.conf +++ b/src/conftest/suiteb/3.10.3/test.conf @@ -1,7 +1,7 @@ certs { untrusted { - x509-ls-revoked = ../ls-revoked.crt + x509-ls-revoked = ls-revoked.crt } } diff --git a/src/conftest/suiteb/9.4.1/test.conf b/src/conftest/suiteb/9.4.1/test.conf index aa4e37e3e8..9821979631 100644 --- a/src/conftest/suiteb/9.4.1/test.conf +++ b/src/conftest/suiteb/9.4.1/test.conf @@ -15,12 +15,12 @@ configs { certs { untrusted { - x509-ls-rsa = ../ls-rsa.crt + x509-ls-rsa = ls-rsa.crt } } keys { - rsa-ls-rsa = ../ls-rsa.key + rsa-ls-rsa = ls-rsa.key } diff --git a/src/conftest/suiteb/9.4.2/test.conf b/src/conftest/suiteb/9.4.2/test.conf index 32312c059f..e28455757f 100644 --- a/src/conftest/suiteb/9.4.2/test.conf +++ b/src/conftest/suiteb/9.4.2/test.conf @@ -15,12 +15,12 @@ configs { certs { untrusted { - x509-ls-256-256 = ../ls-256-256.crt + x509-ls-256-256 = ls-256-256.crt } } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key } diff --git a/src/conftest/suiteb/9.4.3/test.conf b/src/conftest/suiteb/9.4.3/test.conf index 3b028149e6..ba27767228 100644 --- a/src/conftest/suiteb/9.4.3/test.conf +++ b/src/conftest/suiteb/9.4.3/test.conf @@ -15,12 +15,12 @@ configs { certs { untrusted { - x509-ls-256-384 = ../ls-256-384.crt + x509-ls-256-384 = ls-256-384.crt } } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key } diff --git a/src/conftest/suiteb/9.6.1/test.conf b/src/conftest/suiteb/9.6.1/test.conf index aa4e37e3e8..9821979631 100644 --- a/src/conftest/suiteb/9.6.1/test.conf +++ b/src/conftest/suiteb/9.6.1/test.conf @@ -15,12 +15,12 @@ configs { certs { untrusted { - x509-ls-rsa = ../ls-rsa.crt + x509-ls-rsa = ls-rsa.crt } } keys { - rsa-ls-rsa = ../ls-rsa.key + rsa-ls-rsa = ls-rsa.key } diff --git a/src/conftest/suiteb/9.6.2/test.conf b/src/conftest/suiteb/9.6.2/test.conf index 32312c059f..e28455757f 100644 --- a/src/conftest/suiteb/9.6.2/test.conf +++ b/src/conftest/suiteb/9.6.2/test.conf @@ -15,12 +15,12 @@ configs { certs { untrusted { - x509-ls-256-256 = ../ls-256-256.crt + x509-ls-256-256 = ls-256-256.crt } } keys { - ecdsa-ls-256 = ../ls-256.key + ecdsa-ls-256 = ls-256.key }