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 e3dc6f3bbfae83a9b83a6bb11a6197b8495fb2f8..273099f7acd5d7930a9bf1b84ae99b0387642bc9 100644 (file)
--- 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 43ee71506c914dbee50f93df543e1bfa7f57882e..3d410cdbf81b98d81a7e37d5d467def4a3bcdef3 100644 (file)
--- 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 c48f9a021cb902b4185728c09bcf24b1d6de0ec1..5adab0455f9c42dd21d8a722550deb04f5c63c9c 100644 (file)
--- 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 62776fdfe93b995ddd3c179546b3815b86605427..7cbb2a56b2bbd25246ae63baab4107de2d29c0c8 100644 (file)
--- 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 e117baffc175b47216477f3de85f8680b2dd0891..68c35b88c4c455995bdc8fe36097ad560a1c8269 100644 (file)
--- 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 32312c059f9db1c6c3354059977efe3c88c4e072..e28455757fd06c0a291138057278b11fcd1d39c5 100644 (file)
--- 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 3b028149e69c2e13bdfacaca060d0f1dd0ec6094..ba27767228b1dbcdf279572c92cb306dbe1d0b9e 100644 (file)
--- 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 9c8e4237bc226b6163dfc9524793043dda5ff21c..4cdbf697b323f4bf6fdfd8de8f4bb90f185e45d3 100644 (file)
--- 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 4f4e606f7a291eec520eeb9295770ad24dd25fd4..530766b2fdf505195d86a176b60b53286b83d0a9 100644 (file)
--- 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 6f5fe09e9c968a5feb924807be585effdcee7351..e039b79b004536f3fc5a4c874376978467d5a606 100644 (file)
--- 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 f49c4071a0cbb38b408e3e4e344b6b982e517681..ba4fda36140a458f196f99e4ed6ce92ca3c73c5b 100644 (file)
--- 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 2092ce86ad855be99bc5d9b2e27cec011c602aff..5ab414fa54eaed2ab896c20373abe3ffe8ba8f96 100644 (file)
--- 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 ece6409488fe4a22ee6e57de0018b33bdf893faa..bd26a423b22df82ba4d3d2a55e1ba9a6a108c2c6 100644 (file)
--- 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 4977f5d29ba23dc44988e6516ed14a809e23ba3d..a7226af1cd6adb9435091dab83667319aad14083 100644 (file)
--- 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 9dc7d7e5b5c8f3e142079093ac7bc5763673189f..2055e0fd2c100b0d0ff8fa8efd8bff5919f302af 100644 (file)
--- 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 439d4828b221af59d36cdbc99c55f05e2cddb0af..6153ff8f4bea9b0323210b01ef85c14f71daf28b 100644 (file)
--- 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 dae126dd24eda0ae90e75775e73a661f25b53554..9646c3611156c7a1bbee9b5417762045b03d0756 100644 (file)
--- 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 3c72b9d3f6817f3256122d7d1c61723d6a3b636d..d709e69aaa819e5c4fce5dccd0807807b89f085f 100644 (file)
--- 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 7887e76537237c7a3348ef3c5371a8eb1961c9ba..33ef4abd145dddfdcd092f81a6fd8a02d6d8c447 100644 (file)
--- 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 cefa34b74ab9f1216aa37c42bb9c0d2dd45d9fc1..82e1df1897352d220271de4fd6c2f4acbf146fca 100644 (file)
--- 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 9ff65b46d7d562fc3839006ab76de458dd832f90..fd8d4712170c267cf8c79d7bd1cfb2d197204482 100644 (file)
--- 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 cdf4b6be0577830f868309c2d82d2fd3d448c5fc..12abbb6e3a53c89134059b7e791d364c2a81883f 100644 (file)
--- 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 cdf1fdd8cc1a82cfaf34f9f164a134b5f373688c..63c4551133be7656a9fc53e199e00f2f4fda3889 100644 (file)
--- 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 d91d9c0f7a330708917e08eed423697b4cbf68ae..29ed3c3304fda70c87e974ba80eb2853993596f0 100644 (file)
--- 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 4e7137af58cce9a91bad4a5240b75479b398f189..b7ab27b0419246e9a3426ec2dbccd85521f30e4c 100644 (file)
--- 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 6605581147e3a717bb9ca17be5276ac34a9bfddf..08ad71d87853cbc3feff05ed1b79056f14eea4d5 100644 (file)
--- 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 77f2df160739c4c8978f314c94a4b856ffc00b3a..ef554a9c5d2ed652010ae65fe5199140c13496ae 100644 (file)
--- 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 930999138e52622b08c7d9028444e7f14f05e85e..1fdb2707eda8994b8da98c57ca0274ffee0eed8a 100644 (file)
--- 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 c2347e0e704fecf12be219f592ffa07e6cf3b145..f06563ce7db333bde5a1f6656d26c572a5a5047d 100644 (file)
--- 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 2f62f9042452c72cc81fc6187cddee8f7059cffe..68e682fc9c9cc3ded474ee02125f389e92d375cc 100644 (file)
--- 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 9c2657feb454c5bd48d2d9544f37db09f9bb3238..f73ed5b0fa9b2ae6759dbd3c9fc6746b65c226ef 100644 (file)
--- 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 74edf002d9b686d6e892b44647426018f33c58dc..4af5f3052038f48d636418a432fc87b7b5a641b7 100644 (file)
--- 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 cddfa4a37a21080d5e5643d1e4971883fc438794..b9796d726ed3b00db463745c00248f646a978696 100644 (file)
--- 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 d91d9c0f7a330708917e08eed423697b4cbf68ae..29ed3c3304fda70c87e974ba80eb2853993596f0 100644 (file)
--- 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 4e7137af58cce9a91bad4a5240b75479b398f189..b7ab27b0419246e9a3426ec2dbccd85521f30e4c 100644 (file)
--- 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 d6fe33ccdce559ebeaf02132a7db2a3946fe1a0f..a912643d2d07c6987975bc961cae5298356febe3 100644 (file)
--- 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 25038b80d8fe03c45bae64418260b2f9ff178db8..4acf4fc69b5962d367415327a729efad35806224 100644 (file)
--- 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 d6486ecb862da9ec86eb3a2cb42386d7de2ae9e8..d15877ca017c43155f135d795a10c566426fc113 100644 (file)
--- 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 d410d049fea1b68443eb2da6f467a242bac1210e..e0430792d482e864c550b8ba2abcfb52b0ff74aa 100644 (file)
--- 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 329692a06cd282b4350b74b70310991ec9ec030c..e8f21d106c864caa74360b471bc32fa73adbc9ae 100644 (file)
--- 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 774881707e5cf3c0ac4f9846f95d2d51a0bc74c4..b91f617a0f1de82fd0d964a1a324d9f700a8a30f 100644 (file)
--- 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 5c71851f0b0ba3ad26259c48ceba789ae4c9e17a..eb36af91e0e063c4c449ca766a4d835b636ba843 100644 (file)
--- 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 68e36138a3a5662ef7c38c798c19438710ca5482..04b04e6da77d0ae9ddd9f5a7a4298509c9984198 100644 (file)
--- 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 331be14046aeaebe60df27879ce6924909623349..951dd8aa1d9c47d64046b2bfd422451dece5302e 100644 (file)
--- 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 68e36138a3a5662ef7c38c798c19438710ca5482..0f71f5ff0c75345bcea43184d011d33ab8984861 100644 (file)
--- 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 331be14046aeaebe60df27879ce6924909623349..a05d670c3f9a9fae873040d0eaecfab00b9b5b02 100644 (file)
--- 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 5ad387e5371ebcc30a5f5a40148c8d7bb6cde2e7..72a9d9342387bd70bf884ba5486ccf667e0b7ed4 100644 (file)
--- 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 f7d97661e1c8c8508a40a25ca3e32f6e273f6f89..daee2c389c202d1db481b446c5342f5b8218fdef 100644 (file)
--- 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 5ad387e5371ebcc30a5f5a40148c8d7bb6cde2e7..568377b0dbbe77f2e045e137a9e4e5654c79c8ab 100644 (file)
--- 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 f7d97661e1c8c8508a40a25ca3e32f6e273f6f89..daee2c389c202d1db481b446c5342f5b8218fdef 100644 (file)
--- 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 51957fafc4e17481c4486c353390cf41d9a2c8c4..043e48664f60829780d5eb031dd12d8867003bed 100644 (file)
--- 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 f7d97661e1c8c8508a40a25ca3e32f6e273f6f89..fba9b0ce90986f4a9b36b5aee56182bde22048eb 100644 (file)
--- 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 92efc0c6eb3bcb574a71b2840c5296c8f37a8fa1..7057992208ef9de9cb623b9aa1e55c1aff7fc32d 100644 (file)
--- 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 256e0061427bf9234c16e6fb1a8c8b5eac739e3a..03433e7b4332c265b97ed15c3590de71c358e276 100644 (file)
--- 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 92efc0c6eb3bcb574a71b2840c5296c8f37a8fa1..f3a4661e7124c3ffa9e89dd61b0f8ca16aeb27e3 100644 (file)
--- 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 256e0061427bf9234c16e6fb1a8c8b5eac739e3a..3c52dcd5d2227a817bc5bc891dad10002ff8a757 100644 (file)
--- 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 f11f4981a1e0b6a663e5b53375a90e64a5540bd2..acee0e01acd2bbbb6d0cc3e9edbd903044f4849e 100644 (file)
--- 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 367ed5684a694f7c465061ba309b7e6ed8afa00e..8a739af38f41e7b6afa5523d9053fbd4882f9a49 100644 (file)
--- 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 1f7959af422213f5968385771ac4efc158b459a4..0f3104e7610bc98581c6e15752b25b4b41652f2f 100644 (file)
--- 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 abcdb2bb5b96b5eeeafeca495a60fdf350fb2de2..da4e894b5c25d21eaf96542e5f0f5b3b48688b30 100644 (file)
--- 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 aa4e37e3e8b3cb89750038737b75ffb57cac745f..9821979631e958e73fcda9147af577507047c453 100644 (file)
--- 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 32312c059f9db1c6c3354059977efe3c88c4e072..e28455757fd06c0a291138057278b11fcd1d39c5 100644 (file)
--- 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 3b028149e69c2e13bdfacaca060d0f1dd0ec6094..ba27767228b1dbcdf279572c92cb306dbe1d0b9e 100644 (file)
--- 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 aa4e37e3e8b3cb89750038737b75ffb57cac745f..9821979631e958e73fcda9147af577507047c453 100644 (file)
--- 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 32312c059f9db1c6c3354059977efe3c88c4e072..e28455757fd06c0a291138057278b11fcd1d39c5 100644 (file)
--- 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
 }