Add a suffix to all certificate/keys

diff --git a/src/conftest/suiteb/11.1.1/test.conf b/src/conftest/suiteb/11.1.1/test.conf
index 32affb5ae79f0100a9d7e209272ce46ae3091422..e3dc6f3bbfae83a9b83a6bb11a6197b8495fb2f8 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 = ../ls-wrong-san.crt
+               x509-wrong-swan = ../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 c3c20df672cd06baf39df03c1d0cd3546b3db69d..43ee71506c914dbee50f93df543e1bfa7f57882e 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 = ../ls-wrong-san.crt
+               x509-wrong-swan = ../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 583961c819ef32c0bf30243949aaad638ce23cb4..c48f9a021cb902b4185728c09bcf24b1d6de0ec1 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 = ../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 aea156e0cfe408f55183dffcd6c27681a879fa8c..62776fdfe93b995ddd3c179546b3815b86605427 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.crt
+               x509-ls-rsa = ../ls-rsa.crt
        }
 }
 
 keys {
-       rsa = ../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 fe3d063e639f3dfb3513dfc4f18d5737d8b9d1fe..e117baffc175b47216477f3de85f8680b2dd0891 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.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 536ce1cd5823c2b22095efecc47e3081841a0fac..32312c059f9db1c6c3354059977efe3c88c4e072 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.crt
+               x509-ls-256-256 = ../ls-256-256.crt
        }
 }
 
 keys {
-       ecdsa = ../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 b525d4aa652a8c15d24f7fa63ce0a296f699990b..3b028149e69c2e13bdfacaca060d0f1dd0ec6094 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.crt
+               x509-ls-256-384 = ../ls-256-384.crt
        }
 }
 
 keys {
-       ecdsa = ../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 e860c4def1b39ed1583c9cb484eb2ad7c72dd5fa..9c8e4237bc226b6163dfc9524793043dda5ff21c 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.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 314bb107c2fec185049f2d52ac2cd979ade0f3e6..4f4e606f7a291eec520eeb9295770ad24dd25fd4 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.crt
+               x509-ls-icalowhigh = ../ls-icalowhigh.crt
        }
 }
 

diff --git a/src/conftest/suiteb/11.6.1/test.conf b/src/conftest/suiteb/11.6.1/test.conf
index 758b2065a465fda18a5958292302c30d4ea55138..f49c4071a0cbb38b408e3e4e344b6b982e517681 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.crt
+               x509-ls-256-revRSA = ../ls-256-revRSA.crt
        }
 }
 
 keys {
-       ecdsa = ../ls-256.key
+       ecdsa-ls-256 = ../ls-256.key
 }
 
 configs {

diff --git a/src/conftest/suiteb/11.7.1/test.conf b/src/conftest/suiteb/11.7.1/test.conf
index 7472202399a37f9a203491a2fab93e541dfb39fd..ece6409488fe4a22ee6e57de0018b33bdf893faa 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.crt
+               x509-ls-revRSA = ../ls-revRSA.crt
        }
 }
 

diff --git a/src/conftest/suiteb/11.7.2/test.conf b/src/conftest/suiteb/11.7.2/test.conf
index ffd1c98b5f2a0b3025d747d76a9e1a48829a5e87..9dc7d7e5b5c8f3e142079093ac7bc5763673189f 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.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 cb13494786fb128fd34c952877e7cca5967b8aaa..439d4828b221af59d36cdbc99c55f05e2cddb0af 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.key
+       ecdsa-dut-256 = ../dut-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 41a014b01b4f0e90280a2cf84c1138d80a1ea906..dae126dd24eda0ae90e75775e73a661f25b53554 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.key
+       ecdsa-ls-256 = ../ls-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 06cd97cdb340a09750433049f3523811ba483961..3c72b9d3f6817f3256122d7d1c61723d6a3b636d 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.key
+       ecdsa-ls-256 = ../ls-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 7dc770c970f70a93ed625478e6f46c8d6df5260a..7887e76537237c7a3348ef3c5371a8eb1961c9ba 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.key
+       ecdsa-dut-256 = ../dut-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 6d7db575ccc20ab37968bc40a5961721d49014ae..cefa34b74ab9f1216aa37c42bb9c0d2dd45d9fc1 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.key
+       ecdsa-dut-256 = ../dut-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 c787a3879d78d0fe184da062652059cf9197c6ce..9ff65b46d7d562fc3839006ab76de458dd832f90 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.key
+       ecdsa-ls-256 = ../ls-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 607c2dec512a5b08a2d24ddae44cbc6b09cf69ef..cdf4b6be0577830f868309c2d82d2fd3d448c5fc 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.key
+       ecdsa-ls-256 = ../ls-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 0f5ddbab74118cb0d6a0316b09ba069a040b3561..cdf1fdd8cc1a82cfaf34f9f164a134b5f373688c 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.key
+       ecdsa-dut-256 = ../dut-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 60821758ca8a4964849ce3064012fbb377197f62..d91d9c0f7a330708917e08eed423697b4cbf68ae 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.key
+       ecdsa-ls-256 = ../ls-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 7b82078b159d6e48928867fa8c75c652a167d937..4e7137af58cce9a91bad4a5240b75479b398f189 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.key
+       ecdsa-ls-256 = ../ls-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 4996c3e7aa28bd6ee031ffed3714cf689a72405f..6605581147e3a717bb9ca17be5276ac34a9bfddf 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.key
+       ecdsa-dut-256 = ../dut-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 123ee0fa672ea5b325d32e73f6abd14899d45786..77f2df160739c4c8978f314c94a4b856ffc00b3a 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.key
+       ecdsa-ls-256 = ../ls-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 31ab8aba9faee492bbba9b343e0ac53d2a511522..930999138e52622b08c7d9028444e7f14f05e85e 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.key
+       ecdsa-ls-256 = ../ls-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 c8337505f6f20d15d69ec51a6e40becb32fb395b..c2347e0e704fecf12be219f592ffa07e6cf3b145 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.key
+       ecdsa-dut-256 = ../dut-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 07288ff745d31ac705a23a81be8ee588d4a8d192..2f62f9042452c72cc81fc6187cddee8f7059cffe 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.key
+       ecdsa-dut-256 = ../dut-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 ef06f31e20e2279fe164df4b27c3cb1c39fd4cd9..9c2657feb454c5bd48d2d9544f37db09f9bb3238 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.key
+       ecdsa-ls-256 = ../ls-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 30ea08d0d2f79916e1ebd136e5413dc041954419..74edf002d9b686d6e892b44647426018f33c58dc 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.key
+       ecdsa-ls-256 = ../ls-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 d578ecfa7cfe3a9f3fb1eb8a242e878c35fe4073..cddfa4a37a21080d5e5643d1e4971883fc438794 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.key
+       ecdsa-dut-256 = ../dut-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 60821758ca8a4964849ce3064012fbb377197f62..d91d9c0f7a330708917e08eed423697b4cbf68ae 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.key
+       ecdsa-ls-256 = ../ls-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../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 7b82078b159d6e48928867fa8c75c652a167d937..4e7137af58cce9a91bad4a5240b75479b398f189 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.key
+       ecdsa-ls-256 = ../ls-256.key
 }
 
 certs {
        untrusted {
-               x509 = ../ls-256-384.crt
+               x509-ls-256-384 = ../ls-256-384.crt
        }
 }
 

diff --git a/src/conftest/suiteb/3.10.1/test.conf b/src/conftest/suiteb/3.10.1/test.conf
index 0f8a5e319f3d15067ced77df70ba02190c821add..f11f4981a1e0b6a663e5b53375a90e64a5540bd2 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.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 0c405d0dc335313e2b53bec592235565cc1f1c09..367ed5684a694f7c465061ba309b7e6ed8afa00e 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.crt
+               x509-ls-expired = ../ls-expired.crt
        }
 }
 

diff --git a/src/conftest/suiteb/3.10.3/test.conf b/src/conftest/suiteb/3.10.3/test.conf
index 98666a524c3de0803acd1f443a694d10149a7ebf..abcdb2bb5b96b5eeeafeca495a60fdf350fb2de2 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.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 aea156e0cfe408f55183dffcd6c27681a879fa8c..aa4e37e3e8b3cb89750038737b75ffb57cac745f 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.crt
+               x509-ls-rsa = ../ls-rsa.crt
        }
 }
 
 keys {
-       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 536ce1cd5823c2b22095efecc47e3081841a0fac..32312c059f9db1c6c3354059977efe3c88c4e072 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.crt
+               x509-ls-256-256 = ../ls-256-256.crt
        }
 }
 
 keys {
-       ecdsa = ../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 b525d4aa652a8c15d24f7fa63ce0a296f699990b..3b028149e69c2e13bdfacaca060d0f1dd0ec6094 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.crt
+               x509-ls-256-384 = ../ls-256-384.crt
        }
 }
 
 keys {
-       ecdsa = ../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 aea156e0cfe408f55183dffcd6c27681a879fa8c..aa4e37e3e8b3cb89750038737b75ffb57cac745f 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.crt
+               x509-ls-rsa = ../ls-rsa.crt
        }
 }
 
 keys {
-       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 536ce1cd5823c2b22095efecc47e3081841a0fac..32312c059f9db1c6c3354059977efe3c88c4e072 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.crt
+               x509-ls-256-256 = ../ls-256-256.crt
        }
 }
 
 keys {
-       ecdsa = ../ls-256.key
+       ecdsa-ls-256 = ../ls-256.key
 }
 
 

diff --git a/src/conftest/suiteb/dut.conf b/src/conftest/suiteb/dut.conf
index 7344c52ed409a9d12f60fa22f9d89308de26f914..bd96f3cc96b7c1a194cc28e51f048a312b38ad6f 100644 (file)
--- a/src/conftest/suiteb/dut.conf
+++ b/src/conftest/suiteb/dut.conf
@@ -1,24 +1,24 @@
 
 certs {
        trusted {
-               x509 = TA256.crt
-               x509 = TA384.crt
-               x509 = TA384rev256.crt
-               x509 = TA384revRSA.crt
+               x509-TA256 = TA256.crt
+               x509-TA384 = TA384.crt
+               x509-TA384rev256 = TA384rev256.crt
+               x509-TA384revRSA = TA384revRSA.crt
        }
        untrusted {
-               x509 = ICA256.crt
-               x509 = ICA384.crt
-               x509 = ICAlowhigh.crt
-               x509 = ICARSA.crt
-               x509 = rev256.crt
-               x509 = revRSA.crt
-               x509 = dut.crt
+               x509-ICA256 = ICA256.crt
+               x509-ICA384 = ICA384.crt
+               x509-ICAlowhigh = ICAlowhigh.crt
+               x509-ICARSA = ICARSA.crt
+               x509-rev256 = rev256.crt
+               x509-revRSA = revRSA.crt
+               x509-dut = dut.crt
        }
 }
 
 keys {
-       ecdsa = dut.key
+       ecdsa-dut = dut.key
 }
 
 configs {

diff --git a/src/conftest/suiteb/suite.conf b/src/conftest/suiteb/suite.conf
index 59c7e5e333a399ca6e6e578da5b2530e6b27e156..2178d376a2bf6a5b26dc4222c41ae9e4c8c2ff2b 100644 (file)
--- a/src/conftest/suiteb/suite.conf
+++ b/src/conftest/suiteb/suite.conf
@@ -1,24 +1,24 @@
 
 certs {
        trusted {
-               x509 = TA256.crt
-               x509 = TA384.crt
-               x509 = TA384rev256.crt
-               x509 = TA384revRSA.crt
+               x509-TA256 = TA256.crt
+               x509-TA384 = TA384.crt
+               x509-TA384rev256 = TA384rev256.crt
+               x509-TA384revRSA = TA384revRSA.crt
        }
        untrusted {
-               x509 = ICA256.crt
-               x509 = ICA384.crt
-               x509 = ICAlowhigh.crt
-               x509 = ICARSA.crt
-               x509 = rev256.crt
-               x509 = revRSA.crt
-               x509 = ls.crt
+               x509-ICA256 = ICA256.crt
+               x509-ICA384 = ICA384.crt
+               x509-ICAlowhigh = ICAlowhigh.crt
+               x509-ICARSA = ICARSA.crt
+               x509-rev256 = rev256.crt
+               x509-revRSA = revRSA.crt
+               x509-ls = ls.crt
        }
 }
 
 keys {
-       ecdsa = ls.key
+       ecdsa-ls = ls.key
 }
 
 configs {