From: Martin Willi Date: Fri, 10 Dec 2010 13:45:41 +0000 (+0100) Subject: Add a suffix to all certificate/keys X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d851148d5e9991a9b8944ce2ca9442e1ef5eb93d;p=thirdparty%2Fstrongswan.git 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 32affb5ae7..e3dc6f3bbf 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 = ../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 c3c20df672..43ee71506c 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 = ../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 583961c819..c48f9a021c 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 = ../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 aea156e0cf..62776fdfe9 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.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 fe3d063e63..e117baffc1 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.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 536ce1cd58..32312c059f 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.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 b525d4aa65..3b028149e6 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.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 e860c4def1..9c8e4237bc 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.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 314bb107c2..4f4e606f7a 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.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 758b2065a4..f49c4071a0 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.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 7472202399..ece6409488 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.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 ffd1c98b5f..9dc7d7e5b5 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.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 cb13494786..439d4828b2 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.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 41a014b01b..dae126dd24 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.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 06cd97cdb3..3c72b9d3f6 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.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 7dc770c970..7887e76537 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.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 6d7db575cc..cefa34b74a 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.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 c787a3879d..9ff65b46d7 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.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 607c2dec51..cdf4b6be05 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.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 0f5ddbab74..cdf1fdd8cc 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.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 60821758ca..d91d9c0f7a 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.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 7b82078b15..4e7137af58 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.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 4996c3e7aa..6605581147 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.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 123ee0fa67..77f2df1607 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.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 31ab8aba9f..930999138e 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.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 c8337505f6..c2347e0e70 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.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 07288ff745..2f62f90424 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.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 ef06f31e20..9c2657feb4 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.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 30ea08d0d2..74edf002d9 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.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 d578ecfa7c..cddfa4a37a 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.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 60821758ca..d91d9c0f7a 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.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 7b82078b15..4e7137af58 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.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 0f8a5e319f..f11f4981a1 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.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 0c405d0dc3..367ed5684a 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.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 98666a524c..abcdb2bb5b 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.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 aea156e0cf..aa4e37e3e8 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.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 536ce1cd58..32312c059f 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.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 b525d4aa65..3b028149e6 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.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 aea156e0cf..aa4e37e3e8 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.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 536ce1cd58..32312c059f 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.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 7344c52ed4..bd96f3cc96 100644 --- 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 59c7e5e333..2178d376a2 100644 --- 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 {