From 41167d63930026a3efc868386ebea35ecb74754e Mon Sep 17 00:00:00 2001 From: Mechiel Lukkien Date: Sun, 4 Jun 2023 20:43:19 +0200 Subject: [PATCH] regenerate keys/certs for integration tests with expiration far in the future don't want to have expiring tests... --- testdata/integration/tls/Makefile | 8 ++++---- testdata/integration/tls/ca-key.pem | 6 +++--- testdata/integration/tls/ca.csr | 11 ++++++----- testdata/integration/tls/ca.pem | 16 ++++++++-------- testdata/integration/tls/cfssl-ca-csr.json | 3 +++ testdata/integration/tls/config.json | 17 +++++++++++++++++ testdata/integration/tls/moxmail1-key.pem | 6 +++--- testdata/integration/tls/moxmail1.csr | 12 ++++++------ testdata/integration/tls/moxmail1.pem | 20 ++++++++++---------- testdata/integration/tls/moxmail2-key.pem | 6 +++--- testdata/integration/tls/moxmail2.csr | 12 ++++++------ testdata/integration/tls/moxmail2.pem | 20 ++++++++++---------- testdata/integration/tls/moxmail3-key.pem | 6 +++--- testdata/integration/tls/moxmail3.csr | 12 ++++++------ testdata/integration/tls/moxmail3.pem | 20 ++++++++++---------- testdata/integration/tls/postfixmail-key.pem | 6 +++--- testdata/integration/tls/postfixmail.csr | 12 ++++++------ testdata/integration/tls/postfixmail.pem | 20 ++++++++++---------- testdata/integration/tls/readme.txt | 10 ---------- 19 files changed, 117 insertions(+), 106 deletions(-) create mode 100644 testdata/integration/tls/config.json diff --git a/testdata/integration/tls/Makefile b/testdata/integration/tls/Makefile index 9826b31722..c9d9df61fa 100644 --- a/testdata/integration/tls/Makefile +++ b/testdata/integration/tls/Makefile @@ -1,6 +1,6 @@ default: cfssl genkey -initca cfssl-ca-csr.json | cfssljson -bare ca - echo '{}' | cfssl gencert -ca ca.pem -ca-key ca-key.pem -hostname moxmail1.mox1.example - | cfssljson -bare moxmail1 - echo '{}' | cfssl gencert -ca ca.pem -ca-key ca-key.pem -hostname moxmail2.mox2.example - | cfssljson -bare moxmail2 - echo '{}' | cfssl gencert -ca ca.pem -ca-key ca-key.pem -hostname moxmail3.mox3.example - | cfssljson -bare moxmail3 - echo '{}' | cfssl gencert -ca ca.pem -ca-key ca-key.pem -hostname postfixmail.postfix.example - | cfssljson -bare postfixmail + echo '{}' | cfssl gencert -config config.json -profile server -ca ca.pem -ca-key ca-key.pem -hostname moxmail1.mox1.example - | cfssljson -bare moxmail1 + echo '{}' | cfssl gencert -config config.json -profile server -ca ca.pem -ca-key ca-key.pem -hostname moxmail2.mox2.example - | cfssljson -bare moxmail2 + echo '{}' | cfssl gencert -config config.json -profile server -ca ca.pem -ca-key ca-key.pem -hostname moxmail3.mox3.example - | cfssljson -bare moxmail3 + echo '{}' | cfssl gencert -config config.json -profile server -ca ca.pem -ca-key ca-key.pem -hostname postfixmail.postfix.example - | cfssljson -bare postfixmail diff --git a/testdata/integration/tls/ca-key.pem b/testdata/integration/tls/ca-key.pem index 7af136bd28..3944c4ad61 100644 --- a/testdata/integration/tls/ca-key.pem +++ b/testdata/integration/tls/ca-key.pem @@ -1,5 +1,5 @@ -----BEGIN EC PRIVATE KEY----- -MHcCAQEEIN97sFIQvlyDdhL+pOAef4m+N8Zfd2pnEerVO6Q/6lZZoAoGCCqGSM49 -AwEHoUQDQgAE7tPhHDjRBEA9mx7sDr+XJwWncOzgP/mL9ytOP3RkltySAlhai3DG -ew9zHAZGQXy/a7X9OH345ZRjbU8HYXwosQ== +MHcCAQEEIAIxWviXAT3jP2y0nbypyq+r9SoToR1Z8l4/ShXFalyPoAoGCCqGSM49 +AwEHoUQDQgAEsW53/bewar4hugHCihjjl6ljDq21xPq96IJMMTjrGSyDQQczZEba +6FVLV/RN/oE59Tx1a3jEusyooKnIj6ut+Q== -----END EC PRIVATE KEY----- diff --git a/testdata/integration/tls/ca.csr b/testdata/integration/tls/ca.csr index eb16eefc19..2cfae13b31 100644 --- a/testdata/integration/tls/ca.csr +++ b/testdata/integration/tls/ca.csr @@ -1,7 +1,8 @@ -----BEGIN CERTIFICATE REQUEST----- -MIHRMHgCAQAwFjEUMBIGA1UEAxMLbW94IHRlc3QgY2EwWTATBgcqhkjOPQIBBggq -hkjOPQMBBwNCAATu0+EcONEEQD2bHuwOv5cnBadw7OA/+Yv3K04/dGSW3JICWFqL -cMZ7D3McBkZBfL9rtf04ffjllGNtTwdhfCixoAAwCgYIKoZIzj0EAwIDSQAwRgIh -AKunSJ1xcXiLcHLfGAM6bUvHfENwrvWzYaQN+5ykggbBAiEA0s5VRd7H9+2fjcI8 -CzIa97rwFKeTVowcRdaPg63m+ao= +MIH0MIGaAgEAMBYxFDASBgNVBAMTC21veCB0ZXN0IGNhMFkwEwYHKoZIzj0CAQYI +KoZIzj0DAQcDQgAEsW53/bewar4hugHCihjjl6ljDq21xPq96IJMMTjrGSyDQQcz +ZEba6FVLV/RN/oE59Tx1a3jEusyooKnIj6ut+aAiMCAGCSqGSIb3DQEJDjETMBEw +DwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNJADBGAiEAtwFHGm+7zqxnpj6i +EwLMRlXOY0U23xQajcLA/IknZkQCIQCB5ynsMvFJ49EmkcrfRALSqHIHZneH9p0Q +1CHHfQj6Fg== -----END CERTIFICATE REQUEST----- diff --git a/testdata/integration/tls/ca.pem b/testdata/integration/tls/ca.pem index ba8d2ef6bf..308655b817 100644 --- a/testdata/integration/tls/ca.pem +++ b/testdata/integration/tls/ca.pem @@ -1,10 +1,10 @@ -----BEGIN CERTIFICATE----- -MIIBbzCCARagAwIBAgIUEMP01440qIjpWLU0HRVeJgC0LVEwCgYIKoZIzj0EAwIw -FjEUMBIGA1UEAxMLbW94IHRlc3QgY2EwHhcNMjIwNzE2MTAyMTAwWhcNMjcwNzE1 -MTAyMTAwWjAWMRQwEgYDVQQDEwttb3ggdGVzdCBjYTBZMBMGByqGSM49AgEGCCqG -SM49AwEHA0IABO7T4Rw40QRAPZse7A6/lycFp3Ds4D/5i/crTj90ZJbckgJYWotw -xnsPcxwGRkF8v2u1/Th9+OWUY21PB2F8KLGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP -BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRR0sv3suD7vFwQZGy0rbNvqrI0+zAK -BggqhkjOPQQDAgNHADBEAiB0PgtHNkdHHRAFessYbdDZ9RviDFP57WEHnIn7kNcS -0QIgdfPb0TOlpOfF3HcUu0F0rXZzzV1lLzKhbosaJF4WH6M= +MIIBcjCCARigAwIBAgIUZhjg/4oAiX7YspAARmOjFojGseQwCgYIKoZIzj0EAwIw +FjEUMBIGA1UEAxMLbW94IHRlc3QgY2EwIBcNMjMwNjA0MTgzNzAwWhgPMjA1MzA1 +MjcxODM3MDBaMBYxFDASBgNVBAMTC21veCB0ZXN0IGNhMFkwEwYHKoZIzj0CAQYI +KoZIzj0DAQcDQgAEsW53/bewar4hugHCihjjl6ljDq21xPq96IJMMTjrGSyDQQcz +ZEba6FVLV/RN/oE59Tx1a3jEusyooKnIj6ut+aNCMEAwDgYDVR0PAQH/BAQDAgEG +MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFO2GIS1aM4NtFS+a+DrMcmjWiKYB +MAoGCCqGSM49BAMCA0gAMEUCIQCvkuuvPMAW1d3Xns7TYjSa/NFxSjFyiGKsaaJX +ohvCLgIgUkSVYc71RHa5AB3geVbXmmwrFF40+gB1cW7oGwkScBM= -----END CERTIFICATE----- diff --git a/testdata/integration/tls/cfssl-ca-csr.json b/testdata/integration/tls/cfssl-ca-csr.json index 947e23a6af..bfc7766059 100644 --- a/testdata/integration/tls/cfssl-ca-csr.json +++ b/testdata/integration/tls/cfssl-ca-csr.json @@ -3,5 +3,8 @@ "key": { "algo": "ecdsa", "size": 256 + }, + "ca": { + "expiry": "262800h" } } diff --git a/testdata/integration/tls/config.json b/testdata/integration/tls/config.json new file mode 100644 index 0000000000..eb72f4dbfd --- /dev/null +++ b/testdata/integration/tls/config.json @@ -0,0 +1,17 @@ +{ + "signing": { + "default": { + "expiry": "262800h" + }, + "profiles": { + "server": { + "expiry": "262800h", + "usages": [ + "signing", + "key encipherment", + "server auth" + ] + } + } + } +} diff --git a/testdata/integration/tls/moxmail1-key.pem b/testdata/integration/tls/moxmail1-key.pem index 1c6f75f6d8..08636245c6 100644 --- a/testdata/integration/tls/moxmail1-key.pem +++ b/testdata/integration/tls/moxmail1-key.pem @@ -1,5 +1,5 @@ -----BEGIN EC PRIVATE KEY----- -MHcCAQEEIMCay45qmjn2bA3kPGYugT2yZDeDDfFjvGCYK/JTIYW4oAoGCCqGSM49 -AwEHoUQDQgAERRAPZyVWeoVqJyo2+OxWjo9oFRy/NGjDvcRjstZMFIJCn6DQUA+i -Yf/dn1wPqv50UIIKOL1LxykuwRt8OYya/w== +MHcCAQEEIOZXlR9z/jixe9bjSjHOURN0EFLTr9Wumw7W3Zr+XMPmoAoGCCqGSM49 +AwEHoUQDQgAEjzxO852bzPodARDVgWUk+/Xy+G4SEImtN/5De0KgcUWXvVuJFjGg +ruBgyBAoHEkYau53Jcu3ZjHRFdi9RkwlbA== -----END EC PRIVATE KEY----- diff --git a/testdata/integration/tls/moxmail1.csr b/testdata/integration/tls/moxmail1.csr index ef2d194f8f..4ed9481bee 100644 --- a/testdata/integration/tls/moxmail1.csr +++ b/testdata/integration/tls/moxmail1.csr @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE REQUEST----- -MIHvMIGVAgEAMAAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARFEA9nJVZ6hWon -Kjb47FaOj2gVHL80aMO9xGOy1kwUgkKfoNBQD6Jh/92fXA+q/nRQggo4vUvHKS7B -G3w5jJr/oDMwMQYJKoZIhvcNAQkOMSQwIjAgBgNVHREEGTAXghVtb3htYWlsMS5t -b3gxLmV4YW1wbGUwCgYIKoZIzj0EAwIDSQAwRgIhAPyDmstt5ukiS81O0uitofi7 -UYd/4qBJSyT8HQYnTON/AiEAw5GGRwkhu1aQv5vEOsgwSKvxVPKPKEVxY26Isfzv -D5M= +MIHuMIGVAgEAMAAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASPPE7znZvM+h0B +ENWBZST79fL4bhIQia03/kN7QqBxRZe9W4kWMaCu4GDIECgcSRhq7ncly7dmMdEV +2L1GTCVsoDMwMQYJKoZIhvcNAQkOMSQwIjAgBgNVHREEGTAXghVtb3htYWlsMS5t +b3gxLmV4YW1wbGUwCgYIKoZIzj0EAwIDSAAwRQIhAKng26zqtKmRJtpkIdJNQD4C +hIBp+0jUC6apWFW8bvdFAiA/l0HfqQ1/OApMdgM8gNxZSwl13ZCqJlacTwYfkm4r +1Q== -----END CERTIFICATE REQUEST----- diff --git a/testdata/integration/tls/moxmail1.pem b/testdata/integration/tls/moxmail1.pem index 73426d23f4..b0b5d2d185 100644 --- a/testdata/integration/tls/moxmail1.pem +++ b/testdata/integration/tls/moxmail1.pem @@ -1,12 +1,12 @@ -----BEGIN CERTIFICATE----- -MIIBvjCCAWSgAwIBAgIUJLRcyx8Hd2aaLBaeR/rIg09mH1swCgYIKoZIzj0EAwIw -FjEUMBIGA1UEAxMLbW94IHRlc3QgY2EwHhcNMjIwNzE2MTAyMTAwWhcNMjMwNzE2 -MTAyMTAwWjAAMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAERRAPZyVWeoVqJyo2 -+OxWjo9oFRy/NGjDvcRjstZMFIJCn6DQUA+iYf/dn1wPqv50UIIKOL1LxykuwRt8 -OYya/6OBpTCBojAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG -CCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFCW6u2WYBTHKIuzzax/N -OqbttiXqMB8GA1UdIwQYMBaAFFHSy/ey4Pu8XBBkbLSts2+qsjT7MCMGA1UdEQEB -/wQZMBeCFW1veG1haWwxLm1veDEuZXhhbXBsZTAKBggqhkjOPQQDAgNIADBFAiEA -9/3OrGeip/sUL+aKlFCicBJqD7B4jR+wFCVffwU3RoUCIFSIvYKafCjW9U1c+6Ua -7wodN2znLa/oAdIW3KoF/hsO +MIIBtjCCAVygAwIBAgIUeowpo7RMCenGjlCR+4SEza90HVIwCgYIKoZIzj0EAwIw +FjEUMBIGA1UEAxMLbW94IHRlc3QgY2EwIBcNMjMwNjA0MTgzNzAwWhgPMjA1MzA1 +MjcxODM3MDBaMAAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASPPE7znZvM+h0B +ENWBZST79fL4bhIQia03/kN7QqBxRZe9W4kWMaCu4GDIECgcSRhq7ncly7dmMdEV +2L1GTCVso4GbMIGYMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcD +ATAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBReQyt9RscC4SFTh6RPr1uxYSUWjDAf +BgNVHSMEGDAWgBTthiEtWjODbRUvmvg6zHJo1oimATAjBgNVHREBAf8EGTAXghVt +b3htYWlsMS5tb3gxLmV4YW1wbGUwCgYIKoZIzj0EAwIDSAAwRQIgC2+MAUGSugMc +ffJ698+eTVHlxpR8C9PCs8udQVv2noYCIQC4ubNYPW3ZYdvQlRf2Svf3Al2vRl1N +pqt76JJVh9NTMA== -----END CERTIFICATE----- diff --git a/testdata/integration/tls/moxmail2-key.pem b/testdata/integration/tls/moxmail2-key.pem index bbcb3b92af..1f1a9ba2fe 100644 --- a/testdata/integration/tls/moxmail2-key.pem +++ b/testdata/integration/tls/moxmail2-key.pem @@ -1,5 +1,5 @@ -----BEGIN EC PRIVATE KEY----- -MHcCAQEEIH8kxf1fX7q/v+dFi4Fkc18Dxp3Hy9LOh+TZOY7nRV/BoAoGCCqGSM49 -AwEHoUQDQgAEKwVAXfCUjaV74FjXYg7dt1/7uizAoGd689doLTDk1BZNb1vEY7BV -8KCCaTC6alltxtd1DSvG17xl3WvsXaNRXA== +MHcCAQEEIOw1oRBmOXVQd5MZiN1LzPqvqyoCoUpOc3GhO60WRgKFoAoGCCqGSM49 +AwEHoUQDQgAEraCc8aRtk7kusBZ1FK/DMPiicc9FEjvbtHWT8lCPMAXjKWU/wG31 +OktPDzfzu3Unvw1HT+/ljUahJ94InlSDZQ== -----END EC PRIVATE KEY----- diff --git a/testdata/integration/tls/moxmail2.csr b/testdata/integration/tls/moxmail2.csr index 3953bf06a7..0c96711e41 100644 --- a/testdata/integration/tls/moxmail2.csr +++ b/testdata/integration/tls/moxmail2.csr @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE REQUEST----- -MIHvMIGVAgEAMAAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQrBUBd8JSNpXvg -WNdiDt23X/u6LMCgZ3rz12gtMOTUFk1vW8RjsFXwoIJpMLpqWW3G13UNK8bXvGXd -a+xdo1FcoDMwMQYJKoZIhvcNAQkOMSQwIjAgBgNVHREEGTAXghVtb3htYWlsMi5t -b3gyLmV4YW1wbGUwCgYIKoZIzj0EAwIDSQAwRgIhANm6nfTakv+oPR/0Z+BgAB7k -mt7UbguZMhkZlAw/45UVAiEAsGPIdA3zBCZMHps/7W1UN1nLWpx8OXXREDMWPumX -Je8= +MIHuMIGVAgEAMAAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAStoJzxpG2TuS6w +FnUUr8Mw+KJxz0USO9u0dZPyUI8wBeMpZT/AbfU6S08PN/O7dSe/DUdP7+WNRqEn +3gieVINloDMwMQYJKoZIhvcNAQkOMSQwIjAgBgNVHREEGTAXghVtb3htYWlsMi5t +b3gyLmV4YW1wbGUwCgYIKoZIzj0EAwIDSAAwRQIgbFop/kVfFLIWtKVZEvy2YSJU +6zheYeteOTvIuwgcK+UCIQCOXHT/WxsqCUorpT08WHAvfaIgKCOz0PLTL7MtdJED +rQ== -----END CERTIFICATE REQUEST----- diff --git a/testdata/integration/tls/moxmail2.pem b/testdata/integration/tls/moxmail2.pem index 80312b32a0..2a368a9b0b 100644 --- a/testdata/integration/tls/moxmail2.pem +++ b/testdata/integration/tls/moxmail2.pem @@ -1,12 +1,12 @@ -----BEGIN CERTIFICATE----- -MIIBvzCCAWSgAwIBAgIUJllD6/XKNEF58y5UXkI8w3re+SAwCgYIKoZIzj0EAwIw -FjEUMBIGA1UEAxMLbW94IHRlc3QgY2EwHhcNMjIwNzE2MTAyMTAwWhcNMjMwNzE2 -MTAyMTAwWjAAMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEKwVAXfCUjaV74FjX -Yg7dt1/7uizAoGd689doLTDk1BZNb1vEY7BV8KCCaTC6alltxtd1DSvG17xl3Wvs -XaNRXKOBpTCBojAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG -CCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFGYtrzw5pf2uDj4kUvlj -yPtdl6FMMB8GA1UdIwQYMBaAFFHSy/ey4Pu8XBBkbLSts2+qsjT7MCMGA1UdEQEB -/wQZMBeCFW1veG1haWwyLm1veDIuZXhhbXBsZTAKBggqhkjOPQQDAgNJADBGAiEA -7YsZE1oe1/p8PslI2pfs9QltAZfyGoYOKO37Lubu1/0CIQDiZ9StnIXkpGLubUlR -jYFYIyygmAVYZSAS1MLvr5u6Tw== +MIIBtTCCAVygAwIBAgIUc136y8tcpMqkiAC9g4isvHRFrgMwCgYIKoZIzj0EAwIw +FjEUMBIGA1UEAxMLbW94IHRlc3QgY2EwIBcNMjMwNjA0MTgzNzAwWhgPMjA1MzA1 +MjcxODM3MDBaMAAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAStoJzxpG2TuS6w +FnUUr8Mw+KJxz0USO9u0dZPyUI8wBeMpZT/AbfU6S08PN/O7dSe/DUdP7+WNRqEn +3gieVINlo4GbMIGYMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcD +ATAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBS8ILNAqiWwz+hdmGG5gJ29JZKgdDAf +BgNVHSMEGDAWgBTthiEtWjODbRUvmvg6zHJo1oimATAjBgNVHREBAf8EGTAXghVt +b3htYWlsMi5tb3gyLmV4YW1wbGUwCgYIKoZIzj0EAwIDRwAwRAIgSCdO0boA280B +fOGKeWl8+TAA/Lx7HJSza0fmO33ndWgCIGyw+LOgYchONeCGfG0YLz5y2v2J5hme +31FhVsoqAcq4 -----END CERTIFICATE----- diff --git a/testdata/integration/tls/moxmail3-key.pem b/testdata/integration/tls/moxmail3-key.pem index ebef12e6ec..7ba00b3c9e 100644 --- a/testdata/integration/tls/moxmail3-key.pem +++ b/testdata/integration/tls/moxmail3-key.pem @@ -1,5 +1,5 @@ -----BEGIN EC PRIVATE KEY----- -MHcCAQEEILnvFp9ddZFt6gOxamZuyZqn6BiWlYIjJMxv2aIQrVEJoAoGCCqGSM49 -AwEHoUQDQgAEFvGEz2ldoB343IbseoOGsnjrq7yV3nYYcnu6L4kbk45pHCxGbGa0 -vR1vtWojURukkpG7gPR3HsSpyVv6ZHolow== +MHcCAQEEIEO5gTEH/gvyLz3Gjck5bjeno8Lt7agmk15u2Jv0Pd1xoAoGCCqGSM49 +AwEHoUQDQgAEI1hS7Pkx6LJwkTGQ2pPME3J4F1IsyuWM9rrFzWoziBxof4rhqxhU +EkDjDMqJSEj+f/0W6IUSmkou1khyAOu7Og== -----END EC PRIVATE KEY----- diff --git a/testdata/integration/tls/moxmail3.csr b/testdata/integration/tls/moxmail3.csr index 6bbd23694f..77c76926e5 100644 --- a/testdata/integration/tls/moxmail3.csr +++ b/testdata/integration/tls/moxmail3.csr @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE REQUEST----- -MIHuMIGVAgEAMAAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQW8YTPaV2gHfjc -hux6g4ayeOurvJXedhhye7oviRuTjmkcLEZsZrS9HW+1aiNRG6SSkbuA9HcexKnJ -W/pkeiWjoDMwMQYJKoZIhvcNAQkOMSQwIjAgBgNVHREEGTAXghVtb3htYWlsMy5t -b3gzLmV4YW1wbGUwCgYIKoZIzj0EAwIDSAAwRQIgE/PSrIEJDKX7de96b4K0Vk4p -pvrHf6X50EUnjf6y2hYCIQDEr7Im+mpap4OcXTUVV8j3IUpJhw3UqzEXNzC0xk5+ -IA== +MIHvMIGVAgEAMAAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQjWFLs+THosnCR +MZDak8wTcngXUizK5Yz2usXNajOIHGh/iuGrGFQSQOMMyolISP5//RbohRKaSi7W +SHIA67s6oDMwMQYJKoZIhvcNAQkOMSQwIjAgBgNVHREEGTAXghVtb3htYWlsMy5t +b3gzLmV4YW1wbGUwCgYIKoZIzj0EAwIDSQAwRgIhALYlavlUXSDyql3djjXmkivJ +vP2o6/UYvycCD5Zs41LyAiEA5Dl/BUou/9mdQZ1wtO7dECV2og3LFqbux9HH5hhq +CHQ= -----END CERTIFICATE REQUEST----- diff --git a/testdata/integration/tls/moxmail3.pem b/testdata/integration/tls/moxmail3.pem index 3a9e979bd6..8ee2c4151e 100644 --- a/testdata/integration/tls/moxmail3.pem +++ b/testdata/integration/tls/moxmail3.pem @@ -1,12 +1,12 @@ -----BEGIN CERTIFICATE----- -MIIBvjCCAWSgAwIBAgIUfYDKj2P7yS//08rg8YXJh0P4jXowCgYIKoZIzj0EAwIw -FjEUMBIGA1UEAxMLbW94IHRlc3QgY2EwHhcNMjIwNzE2MTAyMTAwWhcNMjMwNzE2 -MTAyMTAwWjAAMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEFvGEz2ldoB343Ibs -eoOGsnjrq7yV3nYYcnu6L4kbk45pHCxGbGa0vR1vtWojURukkpG7gPR3HsSpyVv6 -ZHolo6OBpTCBojAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG -CCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFCGg1KDcMlMm6KsjuWW6 -FusCLoqEMB8GA1UdIwQYMBaAFFHSy/ey4Pu8XBBkbLSts2+qsjT7MCMGA1UdEQEB -/wQZMBeCFW1veG1haWwzLm1veDMuZXhhbXBsZTAKBggqhkjOPQQDAgNIADBFAiEA -6BDw+F8j74ly6FJEtzcHuphuKbVTUCz+QlX00QnyhgICICFy3luHpEPDkXAgaWwz -ZYUcDL4UJTAIyOv9NJ1v7Vl1 +MIIBtzCCAVygAwIBAgIUYsOfXT2yt+VXzQdYJZ6xDrpduyUwCgYIKoZIzj0EAwIw +FjEUMBIGA1UEAxMLbW94IHRlc3QgY2EwIBcNMjMwNjA0MTgzNzAwWhgPMjA1MzA1 +MjcxODM3MDBaMAAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQjWFLs+THosnCR +MZDak8wTcngXUizK5Yz2usXNajOIHGh/iuGrGFQSQOMMyolISP5//RbohRKaSi7W +SHIA67s6o4GbMIGYMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcD +ATAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTgWT5PO/9Hs25S2/AEIh8Kbt2Y+DAf +BgNVHSMEGDAWgBTthiEtWjODbRUvmvg6zHJo1oimATAjBgNVHREBAf8EGTAXghVt +b3htYWlsMy5tb3gzLmV4YW1wbGUwCgYIKoZIzj0EAwIDSQAwRgIhAN4LwY0/jkr7 +Q9kCV2EeTgvja2XKu6kwdptBGacRRezdAiEAtmjbVuUk6OgF40a2IgJD1tbRRF55 +M4T7VRdZJTdIDHQ= -----END CERTIFICATE----- diff --git a/testdata/integration/tls/postfixmail-key.pem b/testdata/integration/tls/postfixmail-key.pem index 94b5a7bb84..a183cd0b2a 100644 --- a/testdata/integration/tls/postfixmail-key.pem +++ b/testdata/integration/tls/postfixmail-key.pem @@ -1,5 +1,5 @@ -----BEGIN EC PRIVATE KEY----- -MHcCAQEEIBeCaoSdSuIBd7W9Xy57nO73JUxBe5b5a/XFwKl8CAGKoAoGCCqGSM49 -AwEHoUQDQgAEoqNvotlvH19KiTPxW20F8cptN9JygjLfiTTdHW99dmGYNXLHo5BU -V5qJHYfJFZKSAlDnaCmsnKp3PoZOwpYEqA== +MHcCAQEEIJo/6dn+2V2ffJgRScOIX6waHFPNUaDOCR05BW0vHeDsoAoGCCqGSM49 +AwEHoUQDQgAEw4QmYTaA5csyzcmJ2V/40xGkJ7woQxxmIyU5OzpYRCz4ejcVQPrg +4/3LS3Tr1SoUJXr/a8NoduQDOX/KvkAadg== -----END EC PRIVATE KEY----- diff --git a/testdata/integration/tls/postfixmail.csr b/testdata/integration/tls/postfixmail.csr index 36a15c74b8..e0d5ebce8a 100644 --- a/testdata/integration/tls/postfixmail.csr +++ b/testdata/integration/tls/postfixmail.csr @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE REQUEST----- -MIHzMIGbAgEAMAAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASio2+i2W8fX0qJ -M/FbbQXxym030nKCMt+JNN0db312YZg1csejkFRXmokdh8kVkpICUOdoKaycqnc+ -hk7ClgSooDkwNwYJKoZIhvcNAQkOMSowKDAmBgNVHREEHzAdghtwb3N0Zml4bWFp -bC5wb3N0Zml4LmV4YW1wbGUwCgYIKoZIzj0EAwIDRwAwRAIgEWB2wVEam2qq/cwZ -JL35+Wg/cL15aA+WQW86kaA8D5MCIFxH3MfVMnPtueIHe7YKvPLT+yA5Svm5UbKq -QGSLk4O1 +MIHzMIGbAgEAMAAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATDhCZhNoDlyzLN +yYnZX/jTEaQnvChDHGYjJTk7OlhELPh6NxVA+uDj/ctLdOvVKhQlev9rw2h25AM5 +f8q+QBp2oDkwNwYJKoZIhvcNAQkOMSowKDAmBgNVHREEHzAdghtwb3N0Zml4bWFp +bC5wb3N0Zml4LmV4YW1wbGUwCgYIKoZIzj0EAwIDRwAwRAIgEHqFqWnzkb+AuQSy +g5WbGDmWV0PC3cn3ZrhnKph+JRYCICHIOwP30IrU2vZlRw7hSJfF73Kp97bZnKnx +hKFU2mu2 -----END CERTIFICATE REQUEST----- diff --git a/testdata/integration/tls/postfixmail.pem b/testdata/integration/tls/postfixmail.pem index 222197e4cb..6e9959b65b 100644 --- a/testdata/integration/tls/postfixmail.pem +++ b/testdata/integration/tls/postfixmail.pem @@ -1,12 +1,12 @@ -----BEGIN CERTIFICATE----- -MIIBxTCCAWqgAwIBAgIUYoJspZbvWHZRn9O5nxAL3iT+UvgwCgYIKoZIzj0EAwIw -FjEUMBIGA1UEAxMLbW94IHRlc3QgY2EwHhcNMjIwNzE2MTAyMTAwWhcNMjMwNzE2 -MTAyMTAwWjAAMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEoqNvotlvH19KiTPx -W20F8cptN9JygjLfiTTdHW99dmGYNXLHo5BUV5qJHYfJFZKSAlDnaCmsnKp3PoZO -wpYEqKOBqzCBqDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG -CCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFIE2NgvzsLPl6qP5gtIE -mBSFgE8hMB8GA1UdIwQYMBaAFFHSy/ey4Pu8XBBkbLSts2+qsjT7MCkGA1UdEQEB -/wQfMB2CG3Bvc3RmaXhtYWlsLnBvc3RmaXguZXhhbXBsZTAKBggqhkjOPQQDAgNJ -ADBGAiEAy0Tem3hHoBB2Ypms9Zkvzk+8NBfezcAqub0uuhazHmkCIQC5XToV12Vd -llBpYGmEg8YGybJxveT+pgGRcTYOJv0v/Q== +MIIBvDCCAWKgAwIBAgIUenc5veQllvPUqrUPTtB8eFtJvHkwCgYIKoZIzj0EAwIw +FjEUMBIGA1UEAxMLbW94IHRlc3QgY2EwIBcNMjMwNjA0MTgzNzAwWhgPMjA1MzA1 +MjcxODM3MDBaMAAwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATDhCZhNoDlyzLN +yYnZX/jTEaQnvChDHGYjJTk7OlhELPh6NxVA+uDj/ctLdOvVKhQlev9rw2h25AM5 +f8q+QBp2o4GhMIGeMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcD +ATAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRvX8dsWXBuohuUI6tMLaGRKG6j6jAf +BgNVHSMEGDAWgBTthiEtWjODbRUvmvg6zHJo1oimATApBgNVHREBAf8EHzAdghtw +b3N0Zml4bWFpbC5wb3N0Zml4LmV4YW1wbGUwCgYIKoZIzj0EAwIDSAAwRQIgdqqP +rKV8yZ+XjDDzj9qp9VNZRqDRfVfYJoMY7c0qx1ECIQCMVEKWwyR0s7dsy7CAibBm +oaIOieBYkklXb1cnraoZsg== -----END CERTIFICATE----- diff --git a/testdata/integration/tls/readme.txt b/testdata/integration/tls/readme.txt index c84df2c9a4..8ebd2f9b3c 100644 --- a/testdata/integration/tls/readme.txt +++ b/testdata/integration/tls/readme.txt @@ -1,12 +1,2 @@ For TLS, keys are generated using https://github.com/cloudflare/cfssl These private keys are published online, don't use them for anything other than local testing. - -Commands: - -# Generate CA -cfssl genkey -initca cfssl-ca-csr.json | cfssljson -bare ca - -echo '{}' | cfssl gencert -ca ca.pem -ca-key ca-key.pem -hostname moxmail1.mox1.example - | cfssljson -bare moxmail1 -echo '{}' | cfssl gencert -ca ca.pem -ca-key ca-key.pem -hostname moxmail2.mox2.example - | cfssljson -bare moxmail2 -echo '{}' | cfssl gencert -ca ca.pem -ca-key ca-key.pem -hostname moxmail3.mox3.example - | cfssljson -bare moxmail3 -echo '{}' | cfssl gencert -ca ca.pem -ca-key ca-key.pem -hostname postfixmail.postfix.example - | cfssljson -bare postfixmail