From 6c2367080d148f4b8c01f96a4c80e3ac55d1ef26 Mon Sep 17 00:00:00 2001 From: mtg Date: Tue, 4 Feb 2020 17:45:58 +0100 Subject: [PATCH 01/12] lint about the encoding of qcstatements for PSD2 --- .../lint_qcstatem_psd2_psd2statem_encoding.go | 54 +++ ..._qcstatem_psd2_psd2statem_encoding_test.go | 57 ++++ .../EvAltRegNumCert56JurContryNotMatching.pem | 28 ++ .../EvAltRegNumCert57NtrJurSopMissing.pem | 28 ++ testdata/QcStmtPsd2Cert01InvalidRoles.pem | 29 ++ testdata/QcStmtPsd2Cert03MissingRolesOid.pem | 29 ++ testdata/QcStmtPsd2Cert05Valid.pem | 29 ++ testdata/QcStmtPsd2Cert07MissingRoleName.pem | 29 ++ testdata/QcStmtPsd2Cert08NcaNameMissing.pem | 28 ++ .../QcStmtPsd2Cert09NcaNameZeroLength.pem | 28 ++ testdata/QcStmtPsd2Cert10RoleNameMissing.pem | 29 ++ .../QcStmtPsd2Cert11RoleNameZeroLenght.pem | 29 ++ ...QcStmtPsd2Cert13Psd2ExtNcaIdZeroLength.pem | 29 ++ testdata/QcStmtPsd2Cert14Valid.pem | 28 ++ .../QcStmtPsd2Cert15NcaIdInconsistent.pem | 29 ++ .../QcStmtPsd2Cert17NcaIdInconsistent.pem | 28 ++ ...QcStmtPsd2Cert22NcaNameWrongStringType.pem | 29 ++ ...tPsd2Cert23Psd2ExtNcaIdWrongStringType.pem | 29 ++ .../QcStmtPsd2Cert24RoleNameIllegalChars.pem | 29 ++ testdata/QcStmtPsd2Cert26RoleOidAsUtf8Str.pem | 29 ++ testdata/QcStmtPsd2Cert27RoleNameNull.pem | 29 ++ testdata/QcStmtPsd2Cert28NcaNameIa5Str.pem | 29 ++ testdata/QcStmtPsd2Cert30Valid.pem | 29 ++ testdata/QcStmtPsd2Cert31Valid.pem | 29 ++ testdata/QcStmtPsd2Cert39Valid.pem | 29 ++ testdata/QcStmtPsd2Cert40Valid.pem | 29 ++ util/alt_reg_num_ev.go | 137 ++++++++ util/misc.go | 22 ++ util/oid.go | 56 ++-- util/qc_stmt.go | 313 +++++++++++++----- 30 files changed, 1225 insertions(+), 104 deletions(-) create mode 100644 lints/etsi/lint_qcstatem_psd2_psd2statem_encoding.go create mode 100644 lints/etsi/lint_qcstatem_psd2_psd2statem_encoding_test.go create mode 100644 testdata/EvAltRegNumCert56JurContryNotMatching.pem create mode 100644 testdata/EvAltRegNumCert57NtrJurSopMissing.pem create mode 100644 testdata/QcStmtPsd2Cert01InvalidRoles.pem create mode 100644 testdata/QcStmtPsd2Cert03MissingRolesOid.pem create mode 100644 testdata/QcStmtPsd2Cert05Valid.pem create mode 100644 testdata/QcStmtPsd2Cert07MissingRoleName.pem create mode 100644 testdata/QcStmtPsd2Cert08NcaNameMissing.pem create mode 100644 testdata/QcStmtPsd2Cert09NcaNameZeroLength.pem create mode 100644 testdata/QcStmtPsd2Cert10RoleNameMissing.pem create mode 100644 testdata/QcStmtPsd2Cert11RoleNameZeroLenght.pem create mode 100644 testdata/QcStmtPsd2Cert13Psd2ExtNcaIdZeroLength.pem create mode 100644 testdata/QcStmtPsd2Cert14Valid.pem create mode 100644 testdata/QcStmtPsd2Cert15NcaIdInconsistent.pem create mode 100644 testdata/QcStmtPsd2Cert17NcaIdInconsistent.pem create mode 100644 testdata/QcStmtPsd2Cert22NcaNameWrongStringType.pem create mode 100644 testdata/QcStmtPsd2Cert23Psd2ExtNcaIdWrongStringType.pem create mode 100644 testdata/QcStmtPsd2Cert24RoleNameIllegalChars.pem create mode 100644 testdata/QcStmtPsd2Cert26RoleOidAsUtf8Str.pem create mode 100644 testdata/QcStmtPsd2Cert27RoleNameNull.pem create mode 100644 testdata/QcStmtPsd2Cert28NcaNameIa5Str.pem create mode 100644 testdata/QcStmtPsd2Cert30Valid.pem create mode 100644 testdata/QcStmtPsd2Cert31Valid.pem create mode 100644 testdata/QcStmtPsd2Cert39Valid.pem create mode 100644 testdata/QcStmtPsd2Cert40Valid.pem create mode 100644 util/alt_reg_num_ev.go create mode 100644 util/misc.go diff --git a/lints/etsi/lint_qcstatem_psd2_psd2statem_encoding.go b/lints/etsi/lint_qcstatem_psd2_psd2statem_encoding.go new file mode 100644 index 000000000..c8e767b0c --- /dev/null +++ b/lints/etsi/lint_qcstatem_psd2_psd2statem_encoding.go @@ -0,0 +1,54 @@ +package etsi + +/* + * ZLint Copyright 2020 Regents of the University of Michigan + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy + * of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +import ( + "github.com/zmap/zcrypto/x509" + "github.com/zmap/zlint/lint" + "github.com/zmap/zlint/util" +) + +type qcStatemPsd2Pd2StatemEnc struct{} + +func (l *qcStatemPsd2Pd2StatemEnc) Initialize() error { + return nil +} + +func (l *qcStatemPsd2Pd2StatemEnc) CheckApplies(c *x509.Certificate) bool { + if !util.IsExtInCert(c, util.QcStateOid) { + return false + } + _, isPresent := util.IsQcStatemPresent(c, &util.IdEtsiPsd2Statem) + return isPresent +} + +func (l *qcStatemPsd2Pd2StatemEnc) Execute(c *x509.Certificate) *lint.LintResult { + qcs := util.ParseQcStatem(util.GetExtFromCert(c, util.QcStateOid).Value, util.IdEtsiPsd2Statem) + if qcs.GetErrorInfo() != "" { + return &lint.LintResult{Status: lint.Error, Details: qcs.GetErrorInfo()} + } + return &lint.LintResult{Status: lint.Pass} +} + +func init() { + lint.RegisterLint(&lint.Lint{ + Name: "e_qcstatem_psd2_psd2statem_encoding", + Description: "This test checks that a PSD2 QcStatement has the correct encoding.", + Citation: "ETSI TS 119 495, 'Annex A (normative): ASN.1 Declaration'", + Source: lint.EtsiEsi, + EffectiveDate: util.EtsiEn319_412_5_V2_2_1_Date, + Lint: &qcStatemPsd2Pd2StatemEnc{}, + }) +} diff --git a/lints/etsi/lint_qcstatem_psd2_psd2statem_encoding_test.go b/lints/etsi/lint_qcstatem_psd2_psd2statem_encoding_test.go new file mode 100644 index 000000000..4f4295a42 --- /dev/null +++ b/lints/etsi/lint_qcstatem_psd2_psd2statem_encoding_test.go @@ -0,0 +1,57 @@ +package etsi + +/* + * ZLint Copyright 2020 Regents of the University of Michigan + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy + * of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +import ( + "github.com/zmap/zlint/lint" + "github.com/zmap/zlint/test" + "testing" +) + +func TestQcStatemPsd2Encoding(t *testing.T) { + m := map[string]lint.LintStatus{ + "QcStmtPsd2Cert01InvalidRoles.pem": lint.Pass, + "QcStmtPsd2Cert03MissingRolesOid.pem": lint.Error, + "QcStmtPsd2Cert05Valid.pem": lint.Pass, + "QcStmtPsd2Cert07MissingRoleName.pem": lint.Error, + "QcStmtPsd2Cert08NcaNameMissing.pem": lint.Error, + "QcStmtPsd2Cert09NcaNameZeroLength.pem": lint.Error, + "QcStmtPsd2Cert10RoleNameMissing.pem": lint.Error, + "QcStmtPsd2Cert11RoleNameZeroLenght.pem": lint.Error, + "QcStmtPsd2Cert13Psd2ExtNcaIdZeroLength.pem": lint.Error, + "QcStmtPsd2Cert14Valid.pem": lint.Pass, + "QcStmtPsd2Cert15NcaIdInconsistent.pem": lint.Pass, + "QcStmtPsd2Cert17NcaIdInconsistent.pem": lint.Pass, + "QcStmtPsd2Cert22NcaNameWrongStringType.pem": lint.Error, + "QcStmtPsd2Cert23Psd2ExtNcaIdWrongStringType.pem": lint.Error, + "QcStmtPsd2Cert24RoleNameIllegalChars.pem": lint.Error, + "QcStmtPsd2Cert26RoleOidAsUtf8Str.pem": lint.Error, + "QcStmtPsd2Cert27RoleNameNull.pem": lint.Error, + "QcStmtPsd2Cert28NcaNameIa5Str.pem": lint.Error, + "QcStmtPsd2Cert30Valid.pem": lint.Pass, + "QcStmtPsd2Cert31Valid.pem": lint.Pass, + "QcStmtPsd2Cert39Valid.pem": lint.Pass, + "QcStmtPsd2Cert40Valid.pem": lint.Pass, + "EvAltRegNumCert56JurContryNotMatching.pem": lint.NA, + "EvAltRegNumCert57NtrJurSopMissing.pem": lint.NA, + } + for inputPath, expected := range m { + out := test.TestLint("e_qcstatem_psd2_psd2statem_encoding", inputPath) + + if out.Status != expected { + t.Errorf("%s: expected %s, got %s", inputPath, expected, out.Status) + } + } +} diff --git a/testdata/EvAltRegNumCert56JurContryNotMatching.pem b/testdata/EvAltRegNumCert56JurContryNotMatching.pem new file mode 100644 index 000000000..222e0aced --- /dev/null +++ b/testdata/EvAltRegNumCert56JurContryNotMatching.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIExzCCA6+gAwIBAgINAmI1p32s9ypT5AANZzANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjCB +oDEMMAoGA1UECgwDTVRHMRIwEAYDVQQHDAlEYXJtc3RhZHQxDzANBgNVBAgMBkhl +c3NlbjELMAkGA1UEBhMCREUxHTAbBgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9u +MRcwFQYDVQRhDA5OVFJERS0xMjM0NTY3ODERMA8GA1UEBRMIMTIzNDU2NzgxEzAR +BgsrBgEEAYI3PAIBAwwCR0IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQDCDYFxtJQFvM+ZiqpiCPIuY7IeRvkrhZjDg9DOJq12j1znWwUgJSYyGcIkirpp +o+vKEKTzz7XGHvZwWJZbiFJqiEIzhbjGFkhPAUU5P+FquQa17zfbeZ5QkFdDW4vD +NQ2zQfQbwkp/GDw5LU+/K6VxB3MzAOWNNp7+j3LFclYIzIa277ri/Ztcxi2U7S1k +JHfmZ01i25QuKY7dHXrKvGj7FSyAVtPd5zqPmBgUSxHZxAEfuXrQ2a1pEQX2Dq5f +/M3Gs8tNro5FGAqowEARKNzNn3omZ1pHgJvZTPfaX20TgxqRktG5RPdya5dHdHFw +gNPWc792M1xwuG+HNz5+jnXlAgMBAAGjggFcMIIBWDAfBgNVHSMEGDAWgBQMXpz+ +ukshbAQdwlq344hfWd5MEjAdBgNVHQ4EFgQUDmuqg6myTVyFzbHSL4f3IMs2Qzsw +DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwGgYDVR0RBBMwEYIPd3d3LmV4 +YW1wbGUuY29tMGIGCCsGAQUFBwEBBFYwVDAoBggrBgEFBQcwAoYcaHR0cDovL2Nh +LmV4YW1wbGUuY29tL2NhLmNydDAoBggrBgEFBQcwAYYcaHR0cDovL29jc3AuZXhh +bXBsZS5jb20vb2NzcDBZBgNVHSAEUjBQMAcGBWeBDAEBMEUGCisGAQQBvUcNGAEw +NzA1BggrBgEFBQcCARYpaHR0cDovL3d3dy50ZWxlc2VjLmRlL3NlcnZlcnBhc3Mv +Y3BzLmh0bWwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA0GCSqGSIb3 +DQEBCwUAA4IBAQBftKEeTH458M79Zrhf9voF8wTGIh5AEuA8JT/bN2wQDuyqeqme +/QuUX7CIu2WwsPbz8CFe2Q1SKPM5gMlTGufb/beha4zCWqM8NXb4t/hSNDkD9226 +s5FW3lT3TzbDRwl+eykrsIUDWEIYyvg6JI7gK/512QbeTn131lIkUkBnuZ9b7kN3 +cPQ0ekicrCk8FjZz3/H21m7BdvSTF0OmBUseTcrH3azKwqn2AH/RAetJmI9W7HQE +hUunPKM+dSW/NQUD9B1DMs9c8W18vOWnnr5BfzS7kyIxh/Td77wQfyGlMaBeYoq7 +uoXjjS8CsVd+Avbhpda+47g9jZQ94Hcyg96o +-----END CERTIFICATE----- diff --git a/testdata/EvAltRegNumCert57NtrJurSopMissing.pem b/testdata/EvAltRegNumCert57NtrJurSopMissing.pem new file mode 100644 index 000000000..e4a944a98 --- /dev/null +++ b/testdata/EvAltRegNumCert57NtrJurSopMissing.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIEyjCCA7KgAwIBAgINAlEr+EzD49s1YT1+/jANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjCB +ozEMMAoGA1UECgwDTVRHMRIwEAYDVQQHDAlEYXJtc3RhZHQxDzANBgNVBAgMBkhl +c3NlbjELMAkGA1UEBhMCREUxHTAbBgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9u +MRowGAYDVQRhDBFOVFJERStIRS0xMjM0NTY3ODERMA8GA1UEBRMIMTIzNDU2Nzgx +EzARBgsrBgEEAYI3PAIBAwwCREUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQDCDYFxtJQFvM+ZiqpiCPIuY7IeRvkrhZjDg9DOJq12j1znWwUgJSYyGcIk +irppo+vKEKTzz7XGHvZwWJZbiFJqiEIzhbjGFkhPAUU5P+FquQa17zfbeZ5QkFdD +W4vDNQ2zQfQbwkp/GDw5LU+/K6VxB3MzAOWNNp7+j3LFclYIzIa277ri/Ztcxi2U +7S1kJHfmZ01i25QuKY7dHXrKvGj7FSyAVtPd5zqPmBgUSxHZxAEfuXrQ2a1pEQX2 +Dq5f/M3Gs8tNro5FGAqowEARKNzNn3omZ1pHgJvZTPfaX20TgxqRktG5RPdya5dH +dHFwgNPWc792M1xwuG+HNz5+jnXlAgMBAAGjggFcMIIBWDAfBgNVHSMEGDAWgBQM +Xpz+ukshbAQdwlq344hfWd5MEjAdBgNVHQ4EFgQUDmuqg6myTVyFzbHSL4f3IMs2 +QzswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwGgYDVR0RBBMwEYIPd3d3 +LmV4YW1wbGUuY29tMGIGCCsGAQUFBwEBBFYwVDAoBggrBgEFBQcwAoYcaHR0cDov +L2NhLmV4YW1wbGUuY29tL2NhLmNydDAoBggrBgEFBQcwAYYcaHR0cDovL29jc3Au +ZXhhbXBsZS5jb20vb2NzcDBZBgNVHSAEUjBQMAcGBWeBDAEBMEUGCisGAQQBvUcN +GAEwNzA1BggrBgEFBQcCARYpaHR0cDovL3d3dy50ZWxlc2VjLmRlL3NlcnZlcnBh +c3MvY3BzLmh0bWwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA0GCSqG +SIb3DQEBCwUAA4IBAQBmq3MNz+GEqMIqOC1IB06DEjtAFHmbqr9uhxSpUM3VuK9y +jm+upuoZCwXFmEeyRXgjKbVFi6aLcMvyhLKfqntQKP517y/baEOeAV+GHUOYg+Gl +ihXze5o/nZAokPm9/b8D0hciqbxte7UlGaTu9wWKscVpDdjsuClNhaM7QD07LbTG +biAk5cbnQNTKqW0VCCU0LgEPBpbugydWDHkv8a5h0r13jiab3U7sfiX/Zq0rDP+i +MPNIYi/a9b/lxZ+TbFbZ1Q1PSW1dmhLvnXWcCVQ6VW2XwcbNkJyVvbJF3KJXMu7S +djvSAK3WrQazO/XhXQluDOMosMZYJZH4CuLLrHxe +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert01InvalidRoles.pem b/testdata/QcStmtPsd2Cert01InvalidRoles.pem new file mode 100644 index 000000000..f0af97ff8 --- /dev/null +++ b/testdata/QcStmtPsd2Cert01InvalidRoles.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE+TCCA+GgAwIBAgINDAL9Kp25SRT/zD2oHzANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAb8wggG7MB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmgYIKwYBBQUHAQMEgY0wgYow +CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA +i+xJAQIwUgYGBACBmCcCMEgwEzARBgcEAIGYJwEBDAZQU1BfUEkMJ0ZlZGVyYWwg +RmluYW5jaWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eQwIREUtQkFGSU4wDQYJKoZI +hvcNAQELBQADggEBACBOt6QdjgWK2amsIFmmf9t7cnwtpigTe3BLnEmsPAPw0TBU +5G0pg1Utep7dvr0k++lMMqAHyxGZ8eUxjxXn/VUFTRisvwuk0GcDiYh7j9D/uyTH +sgD5IOvuADWcxHQ6kRyAWVqu5eLrUIy0l21SfpU1WGLiqCG14RzzljDe7jgWR4vu +KUbk4/LWavRCEXPejDJ7MvQ6Q8Jwj4tzdFZXUdwxQUJ/yp6pwNO3+qka7qi5rHD8 +8tNBPyUevV37humsLjfDzHFINs9D1BMDqZixdGAfOr/rMdw6pUlAUM0nFciYEK6z +sOJ9fnJcGTKWjJeC8XKoOPWyB0Ie0pPy21M5hxQ= +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert03MissingRolesOid.pem b/testdata/QcStmtPsd2Cert03MissingRolesOid.pem new file mode 100644 index 000000000..957666e36 --- /dev/null +++ b/testdata/QcStmtPsd2Cert03MissingRolesOid.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE8DCCA9igAwIBAgINCtgGQhhiIWmoUdvtzDANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAbYwggGyMB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBkQYIKwYBBQUHAQMEgYQwgYEw +CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA +i+xJAQIwSQYGBACBmCcCMD8wCjAIDAZQU1BfUEkMJ0ZlZGVyYWwgRmluYW5jaWFs +IFN1cGVydmlzb3J5IEF1dGhvcml0eQwIREUtQkFGSU4wDQYJKoZIhvcNAQELBQAD +ggEBAAxFzpMwgr+aUxhBzrpsvpZDfaARHczbaPcJmi2h6rThbUFjYbrfssZmiZDq +e5g/4yaRPlKHZFU8yofcAs7hiFQNnKCgK4WlZ9gXe0yylXks6Hn2M2lDMWIk3HmF +ZwsTjyoNbbhW2x70Ewaa2NIWcf+4zK3qGBf4wXqmlhrWsA7EEzswFEUG25qoga2f +NXfJkBKWON7S4K3Bwddull8g2Sl+gJpGlwXlSu1hAV6tBqzH3JniV9AYP3SXAyRQ +S0TalMJ6wkEz+qBxao9+M4E64Q7jgVJbGKvoCgKiTKCbvd24AQDZPgGJspz+3NQR +0DINDw9My5opjNMyB+x4K+Hxtl0= +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert05Valid.pem b/testdata/QcStmtPsd2Cert05Valid.pem new file mode 100644 index 000000000..cae24dcf4 --- /dev/null +++ b/testdata/QcStmtPsd2Cert05Valid.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE+TCCA+GgAwIBAgINCqVMvI3ItM3g3XV2cDANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAb8wggG7MB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmgYIKwYBBQUHAQMEgY0wgYow +CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA +i+xJAQIwUgYGBACBmCcCMEgwEzARBgcEAIGYJwEBDAZQU1BfQVMMJ0ZlZGVyYWwg +RmluYW5jaWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eQwIREUtQkFGSU4wDQYJKoZI +hvcNAQELBQADggEBABmbFutzBZssZnMzUDMYf0bYgStey6CMddV4rKhhUDBqxG9s +xg+xLbXNmEHdJ6lScRK3h2mQ222vPsebLguitcisaqAMIDInYfRS657yEXmSedjy +WIVSrtCaAACYoCwOPEymnjra7WsRu2WZZ+5zk7floDx6o5QXLd73DOJrqr/r6pL9 +NPf5e7g+vlVqAGQhC6Z0s7ri5XInPBeZEMox2Au2ZF/UWNRf00MnRvnYAl2TkDSw +HcbU6L8BtzLxJlZmKw33BfTmi++QOmSPZjpELpnpUamrDmKuFlxu5/QBVz6RS/sX +5tZkQTPg6UtFlkStg9LLJEkEvdT0xMkRvczzTPM= +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert07MissingRoleName.pem b/testdata/QcStmtPsd2Cert07MissingRoleName.pem new file mode 100644 index 000000000..2de38a3d8 --- /dev/null +++ b/testdata/QcStmtPsd2Cert07MissingRoleName.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE8TCCA9mgAwIBAgINAn34kicX+AdEJqPEXDANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAbcwggGzMB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBkgYIKwYBBQUHAQMEgYUwgYIw +CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA +i+xJAQIwSgYGBACBmCcCMEAwCzAJBgcEAIGYJwEEDCdGZWRlcmFsIEZpbmFuY2lh +bCBTdXBlcnZpc29yeSBBdXRob3JpdHkMCERFLWJhZmluMA0GCSqGSIb3DQEBCwUA +A4IBAQAHzTrdqGrwO0YNlzUBybkgaiaRR+iTfpe1gBHwOoL3hE6u1xowj3WozX6b +dXi+wT4jiy6ipsSCUE2sMwhBCIGRnuuJzlD6tIqJ88tAL0E13TvL2iW6IvH9pUM6 +ZMfEh7ejIXe2KRPX0lCuaiTwGXZy6B4EEt/vB5kdoqoDDLx7zDYUKyoUetN9bl75 +X5EjnpmZ1b+vgVCui261HFmwCg+ZxEFmbsmx3+CndOvFUygih9bdhIEj6Y6tlZS+ +S958XsWQwdwWnPIICt68yCxjYZfQ5fOiQa4OfoZ82uekJTr7pM63JwAk97GPt+MH +AFexiknCl6FRVuyRQHXkQkQMSfdG +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert08NcaNameMissing.pem b/testdata/QcStmtPsd2Cert08NcaNameMissing.pem new file mode 100644 index 000000000..f9dae78e9 --- /dev/null +++ b/testdata/QcStmtPsd2Cert08NcaNameMissing.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIEzTCCA7WgAwIBAgINBgcQn55ngMeNmOZhpzANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAZMwggGPMB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBvBggrBgEFBQcBAwRjMGEwCAYG +BACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQAi+xJ +AQIwKQYGBACBmCcCMB8wEzARBgcEAIGYJwEDDAZQU1BfQUkMCERFLUJBRklOMA0G +CSqGSIb3DQEBCwUAA4IBAQBNkBaX1LmQuC7jw/X6iuBwYCvMwCUMjudBa3whU0U0 +jSh8VlzcBAu4dYGglyzhEjibGtHjBR+VW3mels1PCTIe6B4BPsIwnZ3zttjEBHM+ +H/uaShVU+61Cy6xOCGUR0NVyzWThwn0qwi6po0Qqn8+sW53tfTORsXmqaCzmlnDl +LiVJIY4eJYb1iuEucQdJ3KUWduJsJFJHOO+CoJKsoan+1g2cK/3NZC+eLR/e9aC/ +s8SnyGIBf2JxXXDQUY1Nx6Gb7b39Za/Ta6Hzu7Ue1FG/YY3vOwHnESAzmNYV1XiR +QLtIJbag45xPMWzQV5afp0gXRRX4hNE+DkZ52zWBMFTs +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert09NcaNameZeroLength.pem b/testdata/QcStmtPsd2Cert09NcaNameZeroLength.pem new file mode 100644 index 000000000..3f4f4d268 --- /dev/null +++ b/testdata/QcStmtPsd2Cert09NcaNameZeroLength.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIEzzCCA7egAwIBAgINDsKzMgts5dOILcyZyzANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAZUwggGRMB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBxBggrBgEFBQcBAwRlMGMwCAYG +BACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQAi+xJ +AQIwKwYGBACBmCcCMCEwEzARBgcEAIGYJwECDAZQU1BfUEkMAAwIREUtQkFGSU4w +DQYJKoZIhvcNAQELBQADggEBAE+Iv9mf7sZBgnYSg739dk8uHRPpNnkkO6cxDvaq +q0CxylX66XdUoXMytvjVB1I+C2u5tmCVYcZYtv+Rm1ctA5FPsgbJNb8BkKH7wNC4 +Z64YSpdDA5hN3S1tudAKlG0JsXZUpOoevDVqqaONnBeQL9aZSF71nFDiRPWGy/Ox +CCYcQINdgRw6KU66b33Qez9oedRvv9SzAQv265H5ACZXJ+d8j0iVypGKUGxhqeQT +/6o1Eg35srYKyEtkYXBk3rOycxrz9Ux6ZhACzbi3v2MgiBVh5MdYuUn2WlBsb9tw +F7avtF38ETrRpx4q8AysD/vckODyvN6zB3PTEeJPS8o7Yr0= +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert10RoleNameMissing.pem b/testdata/QcStmtPsd2Cert10RoleNameMissing.pem new file mode 100644 index 000000000..b6cf298bb --- /dev/null +++ b/testdata/QcStmtPsd2Cert10RoleNameMissing.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE8DCCA9igAwIBAgINDxPCnUBqjv5Cn7YVoTANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAbYwggGyMB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBkQYIKwYBBQUHAQMEgYQwgYEw +CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA +i+xJAQIwSQYGBACBmCcCMD8wCjAIDAZQU1BfQUkMJ0ZlZGVyYWwgRmluYW5jaWFs +IFN1cGVydmlzb3J5IEF1dGhvcml0eQwIREUtQkFGSU4wDQYJKoZIhvcNAQELBQAD +ggEBAAtdv0K46jF555M5IUa//iLMk6bXnqrlBEjbuVMAD2Rq6FvIE56ug4YQfYWI +85f07JhCnnKdw1npx9wF9avLWNggmNpXTPdF10iCXAE4vYEOtVy8xjYgMPk2swoc +VgAzDZQSPAj8nNQSEgYlpLv5o8IQPBMbP6uKjjDilVHEpIPclDlIhx7tfPtGG4/9 +Pvx2FKtnD52Zr5qQvL85IC5Qy2xIIiznLt2p5E131EssZ1zCHDqzo3mYp1YS81Jj +lowIZUtEICht7f0Ju2/RaKgdwivJ2jKHOh23DNkPWsQDbqgMZS2oQCEgikVu4f3d +6fHt4nGCpQGc6jJg2H3n2KR3O9w= +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert11RoleNameZeroLenght.pem b/testdata/QcStmtPsd2Cert11RoleNameZeroLenght.pem new file mode 100644 index 000000000..934ed5e64 --- /dev/null +++ b/testdata/QcStmtPsd2Cert11RoleNameZeroLenght.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE7DCCA9SgAwIBAgINCGnzNrzLAvsCbWMwJjANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAbIwggGuMB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBjQYIKwYBBQUHAQMEgYAwfjAI +BgYEAI5GAQEwEwYGBACORgEGMAkGBwQAjkYBBgMwFQYIKwYBBQUHCwIwCQYHBACL +7EkBAjBGBgYEAIGYJwIwPDANMAsGBwQAgZgnAQEMAAwnRmVkZXJhbCBGaW5hbmNp +YWwgU3VwZXJ2aXNvcnkgQXV0aG9yaXR5DAJERTANBgkqhkiG9w0BAQsFAAOCAQEA +PimK2OFIHTC2lWv6+xN0lUg6cdlyZk1T7N3iBF90WogG1HjDCKnYlILcvOM581p2 +xleu1orGL/VAcJg0Te9rl9Z4ju6z1b4XsjFXSY1QBMxI8gWP2axFYlxcjRS7sMjk +m7lzQL63qGAJm76Gr1Xatcx7peqwgOMmmLN9e0WES+4z2aw2CksUgsaQ2ouzER4r +hXJtVCemhzNKcbeA+8yROD0ROenqDCNqcAGIGJ4YNSp90Wlp63baxu6u3PJgMr9S +L6sZzaimaFEPY6ggiw7PiYAKxmsybKFBXGJBPEaZ5MB4fDGKbe4nEGiEsM56IMBq +7DMKNBB67j4txmUg2xtd6w== +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert13Psd2ExtNcaIdZeroLength.pem b/testdata/QcStmtPsd2Cert13Psd2ExtNcaIdZeroLength.pem new file mode 100644 index 000000000..e723cbf4f --- /dev/null +++ b/testdata/QcStmtPsd2Cert13Psd2ExtNcaIdZeroLength.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE8TCCA9mgAwIBAgINA3NeFoI2mquIfvSjvjANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAbcwggGzMB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBkgYIKwYBBQUHAQMEgYUwgYIw +CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA +i+xJAQIwSgYGBACBmCcCMEAwEzARBgcEAIGYJwEEDAZQU1BfSUMMJ0ZlZGVyYWwg +RmluYW5jaWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eQwAMA0GCSqGSIb3DQEBCwUA +A4IBAQBakOYgnqxhHxCk7/HBK5GOhLc3Cof9e//jriIvA1jjhFO+iO+e1pVMZ9tK +7VFMBSe+v0XzN9oVuSEGdldebMhAnLBzr+ERhzljvXaCuHzh96u2MDbSeErfF4h9 +25BAoeuaglKoUCR/q1w8QMiwW3IxlbdWMeUc3HAVFSSBZtxAqfh6WE5xUaBJBWw5 +b8dixcQcDN9XsedCiZsjIzPUNldc4uQBEplqFbetVjUGyPVgpzwMyHorCyE4kadi +UXX2GNt7erIUgEme0Egmu1J3/R7lkNjXKtfpejTuxLtV6YyF+K5l2ZsWKbDUHNFI +46Tksr06JcmMw6kpWU52vEAh+n4V +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert14Valid.pem b/testdata/QcStmtPsd2Cert14Valid.pem new file mode 100644 index 000000000..98c54da2b --- /dev/null +++ b/testdata/QcStmtPsd2Cert14Valid.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE1DCCA7ygAwIBAgIND53/U08Ff4UyfPa79TANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAZowggGWMB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjB2BggrBgEFBQcBAwRqMGgwCAYG +BACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQAi+xJ +AQIwMAYGBACBmCcCMCYwEzARBgcEAIGYJwEEDAZQU1BfSUMMBTEyMzQ1DAhERS1C +QUZJTjANBgkqhkiG9w0BAQsFAAOCAQEAHlh68mckSyslsm2Q+in8TW3yFhjZ2/6n +1D/vPzja0LUblklNwKN0Zxa3TsWkKCZh5E/CwaLps/oxNUXDf273I9EFTnaNY0wO +2bcTbwQxkeNKZ7OHcQll8swdD3vhl8koAKAvHPuGJC71orWoc4Cbz6utm2e+IU4X +U1t2PgMPH7GhN/TL/Cqz0xbIcRqkmfLI6dcmckQX+HNBenh546iT/kDY3k6g6tEH +IPHj50A1vgksji5LrLfFhiwMx0X5t/1bPYQaZMKwg8w/mr48ql0gLT48UnLPt2jg +hMklwbWsMn8tTAWqQ3CzGKtgmJO9RWWFyU/jct+Hr7kFrzPG+j4bPg== +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert15NcaIdInconsistent.pem b/testdata/QcStmtPsd2Cert15NcaIdInconsistent.pem new file mode 100644 index 000000000..1952466e3 --- /dev/null +++ b/testdata/QcStmtPsd2Cert15NcaIdInconsistent.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE6TCCA9GgAwIBAgINBXNwOIJE9ou2P9JaNzANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAa8wggGrMB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBigYIKwYBBQUHAQMEfjB8MAgG +BgQAjkYBATATBgYEAI5GAQYwCQYHBACORgEGAzAVBggrBgEFBQcLAjAJBgcEAIvs +SQECMEQGBgQAgZgnAjA6MBMwEQYHBACBmCcBAgwGUFNQX1BJDBtGaW5hbmNpYWwg +Q29uZHVjdCBBdXRob3JpdHkMBkdCLUZDQTANBgkqhkiG9w0BAQsFAAOCAQEAcGLh +qmW9M1HA0kJnhoIcZddPgTSmKgoIhUwPrNJ1R7RJUMkRbJLOGZAOIMz82jUY2pAv +IvtrxSZ9Kj0WeXtNnQ/39TMUogy8rxD3COJCD/n7Jr4vNYYyEeE3WLFMiS9UNJI7 +HPVfknp22f8TRYKYdm7jNqZu8IjFmMp8rBZQgatkEOc01/M2ZlOmbZp4kMcR+QFy +j1emYPjdiT/Sbn2KWFGnbsC9zfSYMr+qri0N9QiS27NJ4Uaj13qj9cvkLHYxuBBp +0SQDYNiU5b10BhonOHuHnf3g9InsIuA6lZibMNIrm+mbJa0YprZBNFesx7gSlrn0 +mA9viD0AJ4F3YeNX4A== +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert17NcaIdInconsistent.pem b/testdata/QcStmtPsd2Cert17NcaIdInconsistent.pem new file mode 100644 index 000000000..1cb4a6195 --- /dev/null +++ b/testdata/QcStmtPsd2Cert17NcaIdInconsistent.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE2zCCA8OgAwIBAgINDR5bwZZ7Cncsu6inkDANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAaEwggGdMB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjB9BggrBgEFBQcBAwRxMG8wCAYG +BACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQAi+xJ +AQIwNwYGBACBmCcCMC0wEzARBgcEAIGYJwEBDAZQU1BfQVMMDU5hdGlvbmFsIEJh +bmsMB1hYLUJBTkswDQYJKoZIhvcNAQELBQADggEBAAhb9Cz45JCQPBJU8DjR7uJi +sCMn79Q3Pu+TbnmR29blkyx/xw3ZuunwgeNXr8hb7+fKRBfXPrtPw/2DtndCIb52 +hbXM98OYoDFyjI3jHhkylce0fyEMrUTGkch63AsI99J2+WPw29hI/tRDoyoX9B6o +YFMHwyEA0En8WzohlhmJ1pBRU3AVeZOB2iIwj4P4yMSw6GzO/JiVFKqiFNRUm4Tc +7bgWDyOJhqnmK0bC5FShD8MwcncBi8YXrtrOC3hiKI4ZM2VVzEtUowMa4ovPDvW+ +lYxzWRwGCFXs8yF/YByhKD5n7Ydj9TtGvLCY89BsI3lvqda19IZwCn70xdlEkUA= +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert22NcaNameWrongStringType.pem b/testdata/QcStmtPsd2Cert22NcaNameWrongStringType.pem new file mode 100644 index 000000000..5730e39c8 --- /dev/null +++ b/testdata/QcStmtPsd2Cert22NcaNameWrongStringType.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE+TCCA+GgAwIBAgINDCggDdySs4DXGHyRDjANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAb8wggG7MB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmgYIKwYBBQUHAQMEgY0wgYow +CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA +i+xJAQIwUgYGBACBmCcCMEgwEzARBgcEAIGYJwEEDAZQU1BfSUMTJ0ZlZGVyYWwg +RmluYW5jaWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eQwIREUtQkFGSU4wDQYJKoZI +hvcNAQELBQADggEBAD7xK3mri61c067i8K6ydtJ0iB/vNYWfP+6BJSPhK2idZ/n4 +MJJTJzJqLmyUrYUjP6QlQmwxS/El81y8VpuXpE3BoOGu7+GSSvcCv7zt9e7tRYmU +TFHK1+yZ18j3g7AzGJIpCT4eKTyGQVPJnhHuZBXdgLcepuyedQ/lg/CCCgVomKmv +04JIUdIoQWVKNGne3rcbjay3g93fnDQ3sWtZEF8j6rQdExBHjZtipkG5TxeOYpg4 +ybC71MTPx3TAa6qFDWUJCqa7oggjS4ew763UR43rvnm3NPwyWvUmnHD47LjzJwBG +KlRvIJttjr6046IX4LxCA+yCo1IdMOBdcaNonF0= +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert23Psd2ExtNcaIdWrongStringType.pem b/testdata/QcStmtPsd2Cert23Psd2ExtNcaIdWrongStringType.pem new file mode 100644 index 000000000..8a264eafb --- /dev/null +++ b/testdata/QcStmtPsd2Cert23Psd2ExtNcaIdWrongStringType.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE+TCCA+GgAwIBAgINDbqKQigFQMGjP0MDWjANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAb8wggG7MB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmgYIKwYBBQUHAQMEgY0wgYow +CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA +i+xJAQIwUgYGBACBmCcCMEgwEzARBgcEAIGYJwECDAZQU1BfUEkMJ0ZlZGVyYWwg +RmluYW5jaWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eRMIREUtQkFGSU4wDQYJKoZI +hvcNAQELBQADggEBAAlJKsrS/tv3xWC+PcCYGZBLzpJTb1c0ZPrNWxlGOsv0RfTV +7ZTh+bE8G2wwfNKuNcJWbeRm+kj/FxjSMXYHsXyyeJ2mJflYD757DFNzT87o8fDh +wJL7UCTgbIx/OjOYdk0BF8FpLHcHHU/g38xiXQEHGnJx0gcOlUotues3m2j11rZD +IKsaRBYHbyt2Hm0taYCe/S+qGbXAEoTa2ViVvQs1b9XbOE1XQs3+Wfmgg7Pw9/V+ +xdvkg66JCUffw5JK/1YF+wX4ruU9/ZVYJ8izjZ8EqZwZc977LoE67EnOwP4gdk1D +uM2/4uA9EZY6ZriCaYfBAMugfwO8UWQWZhM4YWs= +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert24RoleNameIllegalChars.pem b/testdata/QcStmtPsd2Cert24RoleNameIllegalChars.pem new file mode 100644 index 000000000..53374b6f2 --- /dev/null +++ b/testdata/QcStmtPsd2Cert24RoleNameIllegalChars.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE+TCCA+GgAwIBAgINB3QGTJaVm+8UTeHXtjANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAb8wggG7MB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmgYIKwYBBQUHAQMEgY0wgYow +CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA +i+xJAQIwUgYGBACBmCcCMEgwEzARBgcEAIGYJwEDEwZQU1BfQUkMJ0ZlZGVyYWwg +RmluYW5jaWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eQwIREUtQkFGSU4wDQYJKoZI +hvcNAQELBQADggEBAFOtuuVU/X9VzoMqaHedrNYEc4QQKB02cE/fKNDBINQUSUru +QwJJP8cYsBRPGu2ZzLnCJrqKQZVkVqqhoNbMbIWxuGyqJFSBKrwvTiLcbr2HmIC9 +l/Tn/cfZbCjKURt6fX6UwMghanzcpeMWZqYG2KgpIeVSfvphO1qFryjfPTuxLUy/ +MpwNV1z5un8jizOLeqP0HICoc6i17vPtQGxh1+1DyE+LEU+f44oReVjXkK2p/l3p +43caPV2L371JZlm3GxelU6h6pjKFREpwC7HPQiLUyuHxHwEzRO1Bm+yF8DcFF+lr +68rNsX6FvYmLDvgskgMnM2OcFhHn4h/w1CGI78I= +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert26RoleOidAsUtf8Str.pem b/testdata/QcStmtPsd2Cert26RoleOidAsUtf8Str.pem new file mode 100644 index 000000000..dc77f6160 --- /dev/null +++ b/testdata/QcStmtPsd2Cert26RoleOidAsUtf8Str.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIFATCCA+mgAwIBAgINBLJlq+HgwVbgQWY4ljANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAccwggHDMB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBogYIKwYBBQUHAQMEgZUwgZIw +CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA +i+xJAQIwWgYGBACBmCcCMFAwGzAZDA8wLjQuMC4xOTQ5NS4xLjEMBlBTUF9BUwwn +RmVkZXJhbCBGaW5hbmNpYWwgU3VwZXJ2aXNvcnkgQXV0aG9yaXR5DAhERS1CQUZJ +TjANBgkqhkiG9w0BAQsFAAOCAQEADwr7eFDj7TDp9oZvLXfQ4fOHGNkPT2IopGZA +XSWOVEQpTDZrmUbEG9VAZRWPQWrsVJBPGMKVSijGfyWOojw+Ybr/zf06udYfzU4z +foX2r2p5VcF7RaOP0I0IvUu7imVO5CGwAAgNwBWHVClxgHCG7HyPCVwfhuloEtBY +pMoYMwZIPQgjbpQv7a0l7sNyowUgvo2LEntgJ+AmYvjtiOril6cB51VjsJvIzhKG +pAUQ6wU9AMZcVrNxKBrBC/ZvBmpNwXWpqZQ0ht8ZLwAwQcFhlduqTj+RaIvKABTT +OdW8/iD8L/05ttgzUYk9hOBP0nvMp0q8YXAnZiLyjzE/b8xwdA== +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert27RoleNameNull.pem b/testdata/QcStmtPsd2Cert27RoleNameNull.pem new file mode 100644 index 000000000..aea0e3d68 --- /dev/null +++ b/testdata/QcStmtPsd2Cert27RoleNameNull.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE8jCCA9qgAwIBAgINDT4Uv+ZLx36sX5lt6DANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAbgwggG0MB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBkwYIKwYBBQUHAQMEgYYwgYMw +CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA +i+xJAQIwSwYGBACBmCcCMEEwDDAKBQAMBlBTUF9BUwwnRmVkZXJhbCBGaW5hbmNp +YWwgU3VwZXJ2aXNvcnkgQXV0aG9yaXR5DAhERS1CQUZJTjANBgkqhkiG9w0BAQsF +AAOCAQEALJ21NMFW5+QNjpSsR9S1rWwPU1YH1BtQz492fWpY7Dyow9LyFGzmdR5u +9lvud43yXXkeKiOHNa9V5K9QJwFYlO0F4pj0owkmy1qHnsQqMJMfWjXDBY7wJQBh +ilGtKUAL8ideqJBcwS8GtOkC5uNcJ7IDW0elxbCO9aFPIwv34deM64o6QdwceqK9 +g3Cw+1ZwdL1R9b5Dy9AOuwEuljwN+MKh/uTiqA8oEpTgjwx0GsJuxaVLLcwPmw8u +iwS0g/mbdD8fphQzYW5Blrw4UaWc95rjyZ0p3ML13HXvzKbuvpORbVIu/I83YJ+7 +Ue4OIpzAHeEZCXkQnieJnLCeV7amZg== +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert28NcaNameIa5Str.pem b/testdata/QcStmtPsd2Cert28NcaNameIa5Str.pem new file mode 100644 index 000000000..ebe3714ba --- /dev/null +++ b/testdata/QcStmtPsd2Cert28NcaNameIa5Str.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE+TCCA+GgAwIBAgINCXyBm7L1aR4HaG0t+jANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw +MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt +QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAb8wggG7MB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmgYIKwYBBQUHAQMEgY0wgYow +CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA +i+xJAQIwUgYGBACBmCcCMEgwEzARBgcEAIGYJwECDAZQU1BfUEkWJ0ZlZGVyYWwg +RmluYW5jaWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eQwIREUtQkFGSU4wDQYJKoZI +hvcNAQELBQADggEBAB+ZT87A/50XIcJbEzJpullrjxpDRm/JFXAcXP8IzYmudG1u +bAQgzmxM60jv8amdE9iFWjO58kp8skX2J7meR8BaPPFZVMQ90RX2IjnUE/aoYlmH +eM9ykwNzTJP72P4i3s5IjKY1+5l9C4YWBHL+GXhdDQDdS6/LMxYjHbaMhjkHicWR +cDMiK16diYjBKn/cb2fjM1gBkwKiHxQj7uxOYn5vCpMQTT1CbQlCDbbzzNbIUvsk +vsUKcjSOV2eXeNZ/5PDh4Z6FY/nM3wiOIPy4A7MUB987Dv/sRJIwvpXubRMVenfe +UMRDoancxKOAp96XNRNlF3pxfsspOIQSASG5Cks= +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert30Valid.pem b/testdata/QcStmtPsd2Cert30Valid.pem new file mode 100644 index 000000000..be1c0749f --- /dev/null +++ b/testdata/QcStmtPsd2Cert30Valid.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE9zCCA9+gAwIBAgINAbqL8/qvSod2/+EpMzANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAwWhcNMjAxMTAxMDgwMzAwWjBv +MQwwCgYDVQQKDANNVEcxDTALBgNVBAsMBFRlc3QxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEeMBwGA1UEYQwVUFNEUEwt +UEZTQS0xMjM0NTY3ODkwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA +wg2BcbSUBbzPmYqqYgjyLmOyHkb5K4WYw4PQziatdo9c51sFICUmMhnCJIq6aaPr +yhCk88+1xh72cFiWW4hSaohCM4W4xhZITwFFOT/harkGte8323meUJBXQ1uLwzUN +s0H0G8JKfxg8OS1PvyulcQdzMwDljTae/o9yxXJWCMyGtu+64v2bXMYtlO0tZCR3 +5mdNYtuULimO3R16yrxo+xUsgFbT3ec6j5gYFEsR2cQBH7l60NmtaREF9g6uX/zN +xrPLTa6ORRgKqMBAESjczZ96JmdaR4Cb2Uz32l9tE4MakZLRuUT3cmuXR3RxcIDT +1nO/djNccLhvhzc+fo515QIDAQABo4IBvjCCAbowHwYDVR0jBBgwFoAUDF6c/rpL +IWwEHcJat+OIX1neTBIwHQYDVR0OBBYEFA5rqoOpsk1chc2x0i+H9yDLNkM7MA4G +A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMBoGA1UdEQQTMBGCD3d3dy5leGFt +cGxlLmNvbTBiBggrBgEFBQcBAQRWMFQwKAYIKwYBBQUHMAKGHGh0dHA6Ly9jYS5l +eGFtcGxlLmNvbS9jYS5jcnQwKAYIKwYBBQUHMAGGHGh0dHA6Ly9vY3NwLmV4YW1w +bGUuY29tL29jc3AwHwYDVR0gBBgwFjAJBgcEAIvsQAEEMAkGBwQAgZgnAwEwHQYD +VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIGZBggrBgEFBQcBAwSBjDCBiTAI +BgYEAI5GAQEwEwYGBACORgEGMAkGBwQAjkYBBgMwFQYIKwYBBQUHCwIwCQYHBACL +7EkBAjBRBgYEAIGYJwIwRzATMBEGBwQAgZgnAQQMBlBTUF9JQwwnRmVkZXJhbCBG +aW5hbmNpYWwgU3VwZXJ2aXNvcnkgQXV0aG9yaXR5DAdQTC1QRlNBMA0GCSqGSIb3 +DQEBCwUAA4IBAQAO1okP2VXl7NmPbdWX9QtesVxlg5e1VDJrx1NA4gVlXPQi8thW +4JAYSmlOMb0IC3CrjcepmApCjBTJnx99Vn6NV9VbpJXdOKgOK+Kf01OPpjte7nV4 +3Q2IhWg75sJKEqMA2DrxCHQmBQ4HplRTE7EqmrM5Kn6QGUT3rjnqfFu9DYY1AeRc +NVxnqAe5TApePwsfqRsX3u2Ngv3rpF/dQgv78VYZbUMWqz2cxlXFKqEu3zWsRdd/ +kvHgNnPh399AzZrkiXzxz2A/eKJnz5ydxe5vswRZ43za4K/pLf/ftnYlbViK/xfk +2TfQdNdte0y60KireEsdNJ27KTEy5XTxast2 +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert31Valid.pem b/testdata/QcStmtPsd2Cert31Valid.pem new file mode 100644 index 000000000..b0cf61348 --- /dev/null +++ b/testdata/QcStmtPsd2Cert31Valid.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE9zCCA9+gAwIBAgINB1vxbHmAgLCe5oL7DTANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAwWhcNMjAxMTAxMDgwMzAwWjBw +MQwwCgYDVQQKDANNVEcxDTALBgNVBAsMBFRlc3QxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEQkUt +TkJCLTEyMzQuNTY3Ljg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj +68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 +DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk +d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 +zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA +09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAb0wggG5MB8GA1UdIwQYMBaAFAxenP66 +SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO +BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh +bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu +ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt +cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G +A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmAYIKwYBBQUHAQMEgYswgYgw +CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA +i+xJAQIwUAYGBACBmCcCMEYwEzARBgcEAIGYJwEEDAZQU1BfSUMMJ0ZlZGVyYWwg +RmluYW5jaWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eQwGQkUtTkJCMA0GCSqGSIb3 +DQEBCwUAA4IBAQAPDX5qjIUhlenXeIiZ8uqRiAHEIfH+WAgtG1XwuP4SRL2ndF/g +5r12SLuRXyxaWsJ4qnpv3NFrmrs3yux7FSkk0mSC+67EIdhcA765HIDCKToR9RCN +6R6ZrRJl3DKfnzAA1r82ITtpPsmhhx4l1JJNC3LmAc7owAB1SB4bUw8zymPODlir +feNGECjGFyYi9zi+QN+RS++QAzu0XZsNuT5Ud6vGRPgK/jTjYJsHPW+OSgAC7GOo +Saz0E/uGfmopaYckWTU9UYoUNPjQjTeMWFnwCw8bpo+GUqkkxkFMWkpOHzLWRRXg +5+N8a4HuBcTkai8JKMKqhJ35q+KnF2/LXyM7 +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert39Valid.pem b/testdata/QcStmtPsd2Cert39Valid.pem new file mode 100644 index 000000000..45fb5357a --- /dev/null +++ b/testdata/QcStmtPsd2Cert39Valid.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE9DCCA9ygAwIBAgINBe1W3McubIstRtJQ2zANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAwWhcNMjAxMTAxMDgwMzAwWjBs +MQwwCgYDVQQKDANNVEcxDTALBgNVBAsMBFRlc3QxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEbMBkGA1UEYQwSUFNETVQt +TUZTQS1BIDEyMzQ1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwg2B +cbSUBbzPmYqqYgjyLmOyHkb5K4WYw4PQziatdo9c51sFICUmMhnCJIq6aaPryhCk +88+1xh72cFiWW4hSaohCM4W4xhZITwFFOT/harkGte8323meUJBXQ1uLwzUNs0H0 +G8JKfxg8OS1PvyulcQdzMwDljTae/o9yxXJWCMyGtu+64v2bXMYtlO0tZCR35mdN +YtuULimO3R16yrxo+xUsgFbT3ec6j5gYFEsR2cQBH7l60NmtaREF9g6uX/zNxrPL +Ta6ORRgKqMBAESjczZ96JmdaR4Cb2Uz32l9tE4MakZLRuUT3cmuXR3RxcIDT1nO/ +djNccLhvhzc+fo515QIDAQABo4IBvjCCAbowHwYDVR0jBBgwFoAUDF6c/rpLIWwE +HcJat+OIX1neTBIwHQYDVR0OBBYEFA5rqoOpsk1chc2x0i+H9yDLNkM7MA4GA1Ud +DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMBoGA1UdEQQTMBGCD3d3dy5leGFtcGxl +LmNvbTBiBggrBgEFBQcBAQRWMFQwKAYIKwYBBQUHMAKGHGh0dHA6Ly9jYS5leGFt +cGxlLmNvbS9jYS5jcnQwKAYIKwYBBQUHMAGGHGh0dHA6Ly9vY3NwLmV4YW1wbGUu +Y29tL29jc3AwHwYDVR0gBBgwFjAJBgcEAIvsQAEEMAkGBwQAgZgnAwEwHQYDVR0l +BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIGZBggrBgEFBQcBAwSBjDCBiTAIBgYE +AI5GAQEwEwYGBACORgEGMAkGBwQAjkYBBgMwFQYIKwYBBQUHCwIwCQYHBACL7EkB +AjBRBgYEAIGYJwIwRzATMBEGBwQAgZgnAQQMBlBTUF9JQwwnRmVkZXJhbCBGaW5h +bmNpYWwgU3VwZXJ2aXNvcnkgQXV0aG9yaXR5DAdNVC1NRlNBMA0GCSqGSIb3DQEB +CwUAA4IBAQA4dTFubbQHH/I52KqmZH5lcPELQOXIylGxfAQxjMeWlkWsNYatZA5F +AkucP7KYtm4KOIMQR+xMreMGqmBGu0cS8HImBgjuld2N6sIgdUtUgWJjPWP2f8dX +Ymt7CMxeV4rPlk6OA3A7k5ymBO+NtK3RCiHluxf8J+vBf5OtuICF9xTkAqblbGFM +akOUy6s+gC085BbvG5gA4W8788WeQLKlPJOolzf21bWpNX+QgWugjHPAJIRdylBH +pwmR7Agg7+mGsPnDgY0955h/upg2TH41qUZw8vkw3LNw7Ij+RLl1ZL/Eni4Fo8xt +oLkacP2gWcr2k4mkJG4uKVyVAsnPIrPG +-----END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert40Valid.pem b/testdata/QcStmtPsd2Cert40Valid.pem new file mode 100644 index 000000000..c3d4984c3 --- /dev/null +++ b/testdata/QcStmtPsd2Cert40Valid.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE8TCCA9mgAwIBAgINAMgGzG3kIBYA+I8FATANBgkqhkiG9w0BAQsFADBBMRUw +EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U +RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAwWhcNMjAxMTAxMDgwMzAwWjBq +MQwwCgYDVQQKDANNVEcxDTALBgNVBAsMBFRlc3QxEjAQBgNVBAcMCURhcm1zdGFk +dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEZMBcGA1UEYQwQVkFUQkUt +MDg3Njg2NjE0MjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMINgXG0 +lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj68oQpPPP +tcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1DbNB9BvC +Sn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQkd+ZnTWLb +lC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8zcazy02u +jkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA09Zzv3Yz +XHC4b4c3Pn6OdeUCAwEAAaOCAb0wggG5MB8GA1UdIwQYMBaAFAxenP66SyFsBB3C +WrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAOBgNVHQ8B +Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhhbXBsZS5j +b20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2EuZXhhbXBs +ZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFtcGxlLmNv +bS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0GA1UdJQQW +MBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmAYIKwYBBQUHAQMEgYswgYgwCAYGBACO +RgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQAi+xJAQIw +UAYGBACBmCcCMEYwEzARBgcEAIGYJwEEDAZQU1BfSUMMJ0ZlZGVyYWwgRmluYW5j +aWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eQwGQkUtTkJCMA0GCSqGSIb3DQEBCwUA +A4IBAQBGHMv35/nt1N94zpYI5/zlBmp8zY4s0JMLmSYRDQCfoMd1CS+7m3JKIrjB +ll5TakTZ8gpY4U5Je/woS/08Lp0bR94Cq/nbMTas0OiOqmkmV8/Kw0mEWS/q2Jol +XUaa4TbvFB0PI7UOsm7tygjfvB9t0zJy+ytDqTiO9WEGouH5dbGDl4//0gq+JUs2 +IFUJi8UntfPnjD/mSmeqOvrsRlNLOgTkhURcLDV5Ch37moni6Mn2VSH/dXStaEUI +ISLK/dcMOBK69wTUXWOLr8HZ5xFPlP+F6gBnVHXSJGvYyE06MDZ2SqWNlS90kwcr +szINuPd+/+Kvij/xKUwX0tMisQ8y +-----END CERTIFICATE----- diff --git a/util/alt_reg_num_ev.go b/util/alt_reg_num_ev.go new file mode 100644 index 000000000..20982f6a2 --- /dev/null +++ b/util/alt_reg_num_ev.go @@ -0,0 +1,137 @@ +/* + * ZLint Copyright 2020 Regents of the University of Michigan + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy + * of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package util + +import ( + "encoding/asn1" + "reflect" + "regexp" + + "github.com/zmap/zcrypto/x509" +) + +type RDNSequence []RelativeDistinguishedNameSET + +type RelativeDistinguishedNameSET []AttributeTypeAndValue + +type AttributeTypeAndValue struct { + Type asn1.ObjectIdentifier + Value asn1.RawValue +} + +type parsedSubjectElement struct { + IsPresent bool + Value string + Asn1RawValue asn1.RawValue + ErrorString string +} + +type ParsedEvOrgId struct { + Rsi, Country, StateOrProvince, RegRef string +} + +type cabfOrgIdExt struct { + Rsi string `asn1:"printable"` + Country string `asn1:"printable"` + StateOrProvince string `asn1:"printable,optional,tag:0"` + RegRef string `asn1:"utf8"` +} + +func ParseCabfOrgIdExt(c *x509.Certificate) (string, ParsedEvOrgId) { + var result ParsedEvOrgId + + ext := GetExtFromCert(c, CabfExtensionOrganizationIdentifier) + var parsedExt cabfOrgIdExt + // check that we can parse the extension: + rest, err := asn1.Unmarshal(ext.Value, &parsedExt) + if len(rest) != 0 { + return "trailing bytes after extension", result + } + if err != nil { + return "could not parse extension value:" + err.Error(), result + } + errStr := CheckAsn1Reencoding(reflect.ValueOf(parsedExt).Interface(), ext.Value, "invalid string type in extension") + if errStr != "" { + return "", result + } + result.Country = parsedExt.Country + result.RegRef = parsedExt.RegRef + result.Rsi = parsedExt.Rsi + result.StateOrProvince = parsedExt.StateOrProvince + return "", result +} + +func ParseCabfOrgId(oi string, isEtsi bool) (string, ParsedEvOrgId) { + var result ParsedEvOrgId + re_ntr := regexp.MustCompile(`^(NTR)([A-Z]{2})([+]([A-Z]{2}))?-(.+)$`) + re_vat_psd := regexp.MustCompile(`^(VAT|PSD)([A-Z]{2})(())-(.+)$`) + re_lei := regexp.MustCompile(`^(LEI)(XG)(())-(.+)$`) + var sm []string + if re_ntr.MatchString(oi) { + sm = re_ntr.FindStringSubmatch(oi) + } else if re_vat_psd.MatchString(oi) { + sm = re_vat_psd.FindStringSubmatch(oi) + } else if re_lei.MatchString(oi) { + if isEtsi { + sm = re_lei.FindStringSubmatch(oi) + } else { + return "CAB/F subject:organizationIdentifier does not allow LEI", result + } + } else { + return "CAB/F subject:organizationIdentifier has an invalid format", result + } + result.Rsi = sm[1] + result.Country = sm[2] + result.StateOrProvince = sm[3] + result.RegRef = sm[5] + return "", result + +} + +func GetSubjectOrgId(rawSubject []byte) parsedSubjectElement { + return GetSubjectElement(rawSubject, CabfSubjectOrganizationIdentifier) +} +func GetSubjectElement(rawSubject []byte, soughtOid asn1.ObjectIdentifier) parsedSubjectElement { + result := parsedSubjectElement{IsPresent: false, Value: "", ErrorString: ""} + var nl RDNSequence + + rest, err := asn1.Unmarshal(rawSubject, &nl) // parse the sequence of sets, i.e. each list element in nl will be a set + if err != nil { + return parsedSubjectElement{IsPresent: false, Value: "", ErrorString: "error parsing outer SEQ of subject DN"} + } + if len(rest) != 0 { + return parsedSubjectElement{IsPresent: false, ErrorString: "rest len of outer seq != 0 in subject DN", Value: ""} + } + for _, item := range nl { + for _, typeAndValue := range item { + if typeAndValue.Type.Equal(soughtOid) { + if result.IsPresent { + AppendToStringSemicolonDelim(&result.ErrorString, "double AVA found in subject:... encountered, this is not expected") + return result + } + result.IsPresent = true + var parsedString string + _, _ = asn1.Unmarshal(typeAndValue.Value.FullBytes, &parsedString) + result.Value = parsedString + result.Asn1RawValue = typeAndValue.Value + } + } + } + return result +} + +type ParsedOrgId struct { + Rsi, Country, SubDiv, RegRef string +} diff --git a/util/misc.go b/util/misc.go new file mode 100644 index 000000000..34d273546 --- /dev/null +++ b/util/misc.go @@ -0,0 +1,22 @@ +/* + * ZLint Copyright 2020 Regents of the University of Michigan + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy + * of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package util + +func AppendToStringSemicolonDelim(this *string, s string) { + if len(*this) > 0 && len(s) > 0 { + (*this) += "; " + } + (*this) += s +} diff --git a/util/oid.go b/util/oid.go index f52b2fb75..d2e0101a9 100644 --- a/util/oid.go +++ b/util/oid.go @@ -71,27 +71,41 @@ var ( SHA384OID = asn1.ObjectIdentifier{2, 16, 840, 1, 101, 3, 4, 2, 2} SHA512OID = asn1.ObjectIdentifier{2, 16, 840, 1, 101, 3, 4, 2, 3} // other OIDs - OidRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 1} - OidRSASSAPSS = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 10} - OidMD2WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 2} - OidMD5WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 4} - OidSHA1WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 5} - OidSHA224WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 14} - OidSHA256WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 11} - OidSHA384WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 12} - OidSHA512WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 13} - AnyPolicyOID = asn1.ObjectIdentifier{2, 5, 29, 32, 0} - UserNoticeOID = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 2, 2} - CpsOID = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 2, 1} - IdEtsiQcsQcCompliance = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 1} - IdEtsiQcsQcLimitValue = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 2} - IdEtsiQcsQcRetentionPeriod = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 3} - IdEtsiQcsQcSSCD = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 4} - IdEtsiQcsQcEuPDS = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 5} - IdEtsiQcsQcType = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 6} - IdEtsiQcsQctEsign = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 6, 1} - IdEtsiQcsQctEseal = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 6, 2} - IdEtsiQcsQctWeb = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 6, 3} + OidRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 1} + OidRSASSAPSS = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 10} + OidMD2WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 2} + OidMD5WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 4} + OidSHA1WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 5} + OidSHA224WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 14} + OidSHA256WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 11} + OidSHA384WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 12} + OidSHA512WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 13} + AnyPolicyOID = asn1.ObjectIdentifier{2, 5, 29, 32, 0} + UserNoticeOID = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 2, 2} + CpsOID = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 2, 1} + IdEtsiQcsQcCompliance = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 1} + IdEtsiQcsQcLimitValue = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 2} + IdEtsiQcsQcRetentionPeriod = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 3} + IdEtsiQcsQcSSCD = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 4} + IdEtsiQcsQcEuPDS = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 5} + IdEtsiQcsQcType = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 6} + IdEtsiQcsQctEsign = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 6, 1} + IdEtsiQcsQctEseal = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 6, 2} + IdEtsiQcsQctWeb = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 6, 3} + IdEtsiPsd2Statem = asn1.ObjectIdentifier{0, 4, 0, 19495, 2} + IdEtsiPsd2RolePspAs = asn1.ObjectIdentifier{0, 4, 0, 19495, 1, 1} + IdEtsiPsd2RolePspPi = asn1.ObjectIdentifier{0, 4, 0, 19495, 1, 2} + IdEtsiPsd2RolePspAi = asn1.ObjectIdentifier{0, 4, 0, 19495, 1, 3} + IdEtsiPsd2RolePspIc = asn1.ObjectIdentifier{0, 4, 0, 19495, 1, 4} + IdEtsiQcsSemanticsIdLegal = asn1.ObjectIdentifier{0, 4, 0, 194121, 1, 2} + IdEtsiPolicyQcpNatural = asn1.ObjectIdentifier{0, 4, 0, 194112, 1, 0} + IdEtsiPolicyQcpLegal = asn1.ObjectIdentifier{0, 4, 0, 194112, 1, 1} + IdEtsiPolicyQcpNaturalQscd = asn1.ObjectIdentifier{0, 4, 0, 194112, 1, 2} + IdEtsiPolicyQcpLegalQscd = asn1.ObjectIdentifier{0, 4, 0, 194112, 1, 3} + IdEtsiPolicyQcpWeb = asn1.ObjectIdentifier{0, 4, 0, 194112, 1, 4} + IdQcsPkixQCSyntaxV2 = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 11, 2} + CabfSubjectOrganizationIdentifier = asn1.ObjectIdentifier{2, 5, 4, 97} + CabfExtensionOrganizationIdentifier = asn1.ObjectIdentifier{2, 23, 140, 3, 1} ) const ( diff --git a/util/qc_stmt.go b/util/qc_stmt.go index 156210f50..e2f3b3ab8 100644 --- a/util/qc_stmt.go +++ b/util/qc_stmt.go @@ -19,8 +19,21 @@ import ( "encoding/asn1" "fmt" "reflect" + "unicode" + + "github.com/zmap/zcrypto/x509" ) +var EtsiQcStmtOidList = [...]*asn1.ObjectIdentifier{ + &IdEtsiQcsQcCompliance, + &IdEtsiQcsQcLimitValue, + &IdEtsiQcsQcRetentionPeriod, + &IdEtsiQcsQcSSCD, + &IdEtsiQcsQcEuPDS, + &IdEtsiQcsQcType, + &IdEtsiPsd2Statem, +} + type anyContent struct { Raw asn1.RawContent } @@ -29,10 +42,12 @@ type qcStatementWithInfoField struct { Oid asn1.ObjectIdentifier Any asn1.RawValue } + type qcStatementWithoutInfoField struct { Oid asn1.ObjectIdentifier } +// === etsi base ==> type etsiBase struct { errorInfo string isPresent bool @@ -46,6 +61,8 @@ func (this etsiBase) IsPresent() bool { return this.isPresent } +// <== etsi base === + type EtsiQcStmtIf interface { GetErrorInfo() string IsPresent() bool @@ -97,16 +114,76 @@ type EtsiQcPds struct { PdsLocations []PdsLocation } -func AppendToStringSemicolonDelim(this *string, s string) { - if len(*this) > 0 && len(s) > 0 { - (*this) += "; " +// ==== QcStatement 2 (RFC3739)types ===> + +type DecodedQcS2 struct { + etsiBase + Decoded QcStatemt2 +} +type QcStatemt2 struct { + SemanticsId asn1.ObjectIdentifier `asn1:"optional"` + NameRegAuthorities NameRegistrationAuthorities `asn1:"optional"` +} + +type NameRegistrationAuthorities []asn1.RawValue + +// <=== QcStatement 2 (RFC3739)types ==== + +// ==== PSD2 QcStatement types ===> +type Psd2RoleOfPspType int + +const ( + RoleAs Psd2RoleOfPspType = 1 + RolePi Psd2RoleOfPspType = 2 + RoleAi Psd2RoleOfPspType = 3 + RoleIc Psd2RoleOfPspType = 4 +) + +// === ASN.1 Types ==> +type Psd2RoleOfPsp struct { + RoleType asn1.ObjectIdentifier + RoleOfPspName string `asn1:"utf8"` +} + +type EtsiPsd2QcStatem struct { + Roles []Psd2RoleOfPsp + NCAName string `asn1:"utf8"` + CountryAndNCAId string `asn1:"utf8"` +} + +// <== ASN.1 Types === + +type EtsiPsd2 struct { + etsiBase + DecodedPsd2Statm EtsiPsd2QcStatem +} + +func (this EtsiPsd2) getCountryAndNcaId() (string, string) { + runes := []rune(this.DecodedPsd2Statm.CountryAndNCAId) + if len(this.DecodedPsd2Statm.CountryAndNCAId) < 4 || !unicode.IsUpper(runes[0]) || !unicode.IsUpper(runes[1]) || runes[2] != '-' { + return "", "" } - (*this) += s + return string(runes[0:2]), string(runes[3:]) +} + +func (this EtsiPsd2) GetNcaCountry() string { + co, _ := this.getCountryAndNcaId() + return co } +func (this EtsiPsd2) GetNcaId() string { + _, ncaId := this.getCountryAndNcaId() + return ncaId +} + +// <=== PSD2 QcStatement types ==== -func checkAsn1Reencoding(i interface{}, originalEncoding []byte, appendIfComparisonFails string) string { +func CheckAsn1Reencoding(i interface{}, originalEncoding []byte, appendIfComparisonFails string) string { + return CheckAsn1ReencodingWithParams(i, originalEncoding, appendIfComparisonFails, "") +} + +func CheckAsn1ReencodingWithParams(i interface{}, originalEncoding []byte, appendIfComparisonFails string, params string) string { result := "" - reencoded, marshErr := asn1.Marshal(i) + reencoded, marshErr := asn1.MarshalWithParams(i, params) if marshErr != nil { AppendToStringSemicolonDelim(&result, fmt.Sprintf("error reencoding ASN1 value of statementInfo field: %s", marshErr)) @@ -117,15 +194,12 @@ func checkAsn1Reencoding(i interface{}, originalEncoding []byte, appendIfCompari return result } +type EtsiPsd2OrgId struct { + Rsi, Country, NcaId, PspId string +} + func IsAnyEtsiQcStatementPresent(extVal []byte) bool { - oidList := make([]*asn1.ObjectIdentifier, 6) - oidList[0] = &IdEtsiQcsQcCompliance - oidList[1] = &IdEtsiQcsQcLimitValue - oidList[2] = &IdEtsiQcsQcRetentionPeriod - oidList[3] = &IdEtsiQcsQcSSCD - oidList[4] = &IdEtsiQcsQcEuPDS - oidList[5] = &IdEtsiQcsQcType - for _, oid := range oidList { + for _, oid := range EtsiQcStmtOidList { r := ParseQcStatem(extVal, *oid) if r.IsPresent() { return true @@ -134,6 +208,17 @@ func IsAnyEtsiQcStatementPresent(extVal []byte) bool { return false } +func IsQcStatemPresent(c *x509.Certificate, oid *asn1.ObjectIdentifier) (string, bool) { + if !IsExtInCert(c, QcStateOid) { + return "", false + } + qcs := ParseQcStatem(GetExtFromCert(c, QcStateOid).Value, *oid) + if qcs.GetErrorInfo() != "" { + return qcs.GetErrorInfo(), qcs.IsPresent() + } + return "", qcs.IsPresent() +} + //nolint:gocyclo func ParseQcStatem(extVal []byte, sought asn1.ObjectIdentifier) EtsiQcStmtIf { sl := make([]anyContent, 0) @@ -169,85 +254,147 @@ func ParseQcStatem(extVal []byte, sought asn1.ObjectIdentifier) EtsiQcStmtIf { continue } if statem.Oid.Equal(IdEtsiQcsQcCompliance) { - etsiObj := Etsi421QualEuCert{etsiBase: etsiBase{isPresent: true}} - statemWithoutInfo := qcStatementWithoutInfoField{Oid: statem.Oid} - AppendToStringSemicolonDelim(&etsiObj.errorInfo, checkAsn1Reencoding(reflect.ValueOf(statemWithoutInfo).Interface(), raw.Raw, - "invalid format of ETSI Complicance statement")) - return etsiObj + return handleIdEtsiQcsQcCompliance(statem, raw) } else if statem.Oid.Equal(IdEtsiQcsQcLimitValue) { - etsiObj := EtsiQcLimitValue{etsiBase: etsiBase{isPresent: true}} - numErr := false - alphErr := false - var numeric EtsiMonetaryValueNum - var alphabetic EtsiMonetaryValueAlph - restNum, errNum := asn1.Unmarshal(statem.Any.FullBytes, &numeric) - if len(restNum) != 0 || errNum != nil { - numErr = true - } else { - etsiObj.IsNum = true - etsiObj.Amount = numeric.Amount - etsiObj.Exponent = numeric.Exponent - etsiObj.CurrencyNum = numeric.Iso4217CurrencyCodeNum - - } - if numErr { - restAlph, errAlph := asn1.Unmarshal(statem.Any.FullBytes, &alphabetic) - if len(restAlph) != 0 || errAlph != nil { - alphErr = true - } else { - etsiObj.IsNum = false - etsiObj.Amount = alphabetic.Amount - etsiObj.Exponent = alphabetic.Exponent - etsiObj.CurrencyAlph = alphabetic.Iso4217CurrencyCodeAlph - AppendToStringSemicolonDelim(&etsiObj.errorInfo, - checkAsn1Reencoding(reflect.ValueOf(alphabetic).Interface(), - statem.Any.FullBytes, "error with ASN.1 encoding, possibly a wrong ASN.1 string type was used")) - } - } - if numErr && alphErr { - etsiObj.errorInfo = "error parsing the ETSI Qc Statement statementInfo field" - } - return etsiObj - + return handleIdEtsiQcsQcLimitValue(statem) } else if statem.Oid.Equal(IdEtsiQcsQcRetentionPeriod) { - etsiObj := EtsiQcRetentionPeriod{etsiBase: etsiBase{isPresent: true}} - rest, err := asn1.Unmarshal(statem.Any.FullBytes, &etsiObj.Period) - - if len(rest) != 0 || err != nil { - etsiObj.errorInfo = "error parsing the statementInfo field" - } - return etsiObj + return handleIdEtsiQcsQcRetentionPeriod(statem) } else if statem.Oid.Equal(IdEtsiQcsQcSSCD) { - etsiObj := EtsiQcSscd{etsiBase: etsiBase{isPresent: true}} - statemWithoutInfo := qcStatementWithoutInfoField{Oid: statem.Oid} - AppendToStringSemicolonDelim(&etsiObj.errorInfo, checkAsn1Reencoding(reflect.ValueOf(statemWithoutInfo).Interface(), raw.Raw, - "invalid format of ETSI SCSD statement")) - return etsiObj + return handleIdEtsiQcsQcSSCD(statem, raw) } else if statem.Oid.Equal(IdEtsiQcsQcEuPDS) { - etsiObj := EtsiQcPds{etsiBase: etsiBase{isPresent: true}} - rest, err := asn1.Unmarshal(statem.Any.FullBytes, &etsiObj.PdsLocations) - if len(rest) != 0 || err != nil { - etsiObj.errorInfo = "error parsing the statementInfo field" - } else { - AppendToStringSemicolonDelim(&etsiObj.errorInfo, - checkAsn1Reencoding(reflect.ValueOf(etsiObj.PdsLocations).Interface(), statem.Any.FullBytes, - "error with ASN.1 encoding, possibly a wrong ASN.1 string type was used")) - } - return etsiObj + return handleIdEtsiQcsQcEuPDS(statem) } else if statem.Oid.Equal(IdEtsiQcsQcType) { - var qcType Etsi423QcType - qcType.isPresent = true - rest, err := asn1.Unmarshal(statem.Any.FullBytes, &qcType.TypeOids) - if len(rest) != 0 || err != nil { - return etsiBase{errorInfo: "error parsing IdEtsiQcsQcType extension statementInfo field", isPresent: true} - } - return qcType + return handleIdEtsiQcsQcType(statem) + } else if statem.Oid.Equal(IdEtsiPsd2Statem) { + return handleIdEtsiPsd2Statem(statem) + } else if statem.Oid.Equal(IdQcsPkixQCSyntaxV2) { + return handleIdQcsPkixQCSyntaxV2(statem) } else { return etsiBase{errorInfo: "", isPresent: true} } - } return etsiBase{errorInfo: "", isPresent: false} +} + +func handleIdQcsPkixQCSyntaxV2(statem qcStatementWithInfoField) EtsiQcStmtIf { + var qcs2Statem DecodedQcS2 + qcs2Statem.isPresent = true + if len(statem.Any.FullBytes) == 0 { + return qcs2Statem + } + rest, err := asn1.Unmarshal(statem.Any.FullBytes, &qcs2Statem.Decoded) + if err != nil { + AppendToStringSemicolonDelim(&qcs2Statem.errorInfo, "error parsing statement: "+err.Error()) + } + if len(rest) != 0 { + AppendToStringSemicolonDelim(&qcs2Statem.errorInfo, "trailing bytes after QcStatement") + } + return qcs2Statem +} + +func handleIdEtsiPsd2Statem(statem qcStatementWithInfoField) EtsiQcStmtIf { + var psd2Statem EtsiPsd2 + psd2Statem.isPresent = true + rest, err := asn1.Unmarshal(statem.Any.FullBytes, &psd2Statem.DecodedPsd2Statm) + if len(rest) != 0 || err != nil { + return etsiBase{errorInfo: "error parsing IdEtsiPsd2Statem extension statementInfo field", isPresent: true} + } + if psd2Statem.DecodedPsd2Statm.CountryAndNCAId == "" || psd2Statem.DecodedPsd2Statm.NCAName == "" { + AppendToStringSemicolonDelim(&psd2Statem.errorInfo, "field has length 0") + } + for _, role := range psd2Statem.DecodedPsd2Statm.Roles { + if role.RoleOfPspName == "" { + AppendToStringSemicolonDelim(&psd2Statem.errorInfo, "field has length 0") + } + } + AppendToStringSemicolonDelim(&psd2Statem.errorInfo, + CheckAsn1Reencoding(reflect.ValueOf(psd2Statem.DecodedPsd2Statm).Interface(), statem.Any.FullBytes, + "error with ASN.1 encoding, possibly a wrong ASN.1 string type was used")) + return psd2Statem +} + +func handleIdEtsiQcsQcType(statem qcStatementWithInfoField) EtsiQcStmtIf { + var qcType Etsi423QcType + qcType.isPresent = true + rest, err := asn1.Unmarshal(statem.Any.FullBytes, &qcType.TypeOids) + if len(rest) != 0 || err != nil { + return etsiBase{errorInfo: "error parsing IdEtsiQcsQcType extension statementInfo field", isPresent: true} + } + return qcType +} + +func handleIdEtsiQcsQcEuPDS(statem qcStatementWithInfoField) EtsiQcStmtIf { + etsiObj := EtsiQcPds{etsiBase: etsiBase{isPresent: true}} + rest, err := asn1.Unmarshal(statem.Any.FullBytes, &etsiObj.PdsLocations) + if len(rest) != 0 || err != nil { + etsiObj.errorInfo = "error parsing the statementInfo field" + } else { + AppendToStringSemicolonDelim(&etsiObj.errorInfo, + CheckAsn1Reencoding(reflect.ValueOf(etsiObj.PdsLocations).Interface(), statem.Any.FullBytes, + "error with ASN.1 encoding, possibly a wrong ASN.1 string type was used")) + } + return etsiObj +} + +func handleIdEtsiQcsQcSSCD(statem qcStatementWithInfoField, raw anyContent) EtsiQcStmtIf { + etsiObj := EtsiQcSscd{etsiBase: etsiBase{isPresent: true}} + statemWithoutInfo := qcStatementWithoutInfoField{Oid: statem.Oid} + AppendToStringSemicolonDelim(&etsiObj.errorInfo, CheckAsn1Reencoding(reflect.ValueOf(statemWithoutInfo).Interface(), raw.Raw, + "invalid format of ETSI SCSD statement")) + return etsiObj +} + +func handleIdEtsiQcsQcRetentionPeriod(statem qcStatementWithInfoField) EtsiQcStmtIf { + etsiObj := EtsiQcRetentionPeriod{etsiBase: etsiBase{isPresent: true}} + rest, err := asn1.Unmarshal(statem.Any.FullBytes, &etsiObj.Period) + + if len(rest) != 0 || err != nil { + etsiObj.errorInfo = "error parsing the statementInfo field" + } + return etsiObj +} + +func handleIdEtsiQcsQcLimitValue(statem qcStatementWithInfoField) EtsiQcStmtIf { + etsiObj := EtsiQcLimitValue{etsiBase: etsiBase{isPresent: true}} + numErr := false + alphErr := false + var numeric EtsiMonetaryValueNum + var alphabetic EtsiMonetaryValueAlph + restNum, errNum := asn1.Unmarshal(statem.Any.FullBytes, &numeric) + if len(restNum) != 0 || errNum != nil { + numErr = true + } else { + etsiObj.IsNum = true + etsiObj.Amount = numeric.Amount + etsiObj.Exponent = numeric.Exponent + etsiObj.CurrencyNum = numeric.Iso4217CurrencyCodeNum + + } + if numErr { + restAlph, errAlph := asn1.Unmarshal(statem.Any.FullBytes, &alphabetic) + if len(restAlph) != 0 || errAlph != nil { + alphErr = true + } else { + etsiObj.IsNum = false + etsiObj.Amount = alphabetic.Amount + etsiObj.Exponent = alphabetic.Exponent + etsiObj.CurrencyAlph = alphabetic.Iso4217CurrencyCodeAlph + AppendToStringSemicolonDelim(&etsiObj.errorInfo, + CheckAsn1Reencoding(reflect.ValueOf(alphabetic).Interface(), + statem.Any.FullBytes, "error with ASN.1 encoding, possibly a wrong ASN.1 string type was used")) + } + } + if numErr && alphErr { + etsiObj.errorInfo = "error parsing the ETSI Qc Statement statementInfo field" + } + return etsiObj +} +func handleIdEtsiQcsQcCompliance(statem qcStatementWithInfoField, raw anyContent) EtsiQcStmtIf { + etsiObj := Etsi421QualEuCert{etsiBase: etsiBase{isPresent: true}} + statemWithoutInfo := qcStatementWithoutInfoField{Oid: statem.Oid} + AppendToStringSemicolonDelim(&etsiObj.errorInfo, CheckAsn1Reencoding(reflect.ValueOf(statemWithoutInfo).Interface(), raw.Raw, + "invalid format of ETSI Complicance statement")) + return etsiObj } From 4666bb74318f221c77ca69616603d2e897d7cd3e Mon Sep 17 00:00:00 2001 From: mtg Date: Tue, 4 Feb 2020 17:58:04 +0100 Subject: [PATCH 02/12] Revert "lint about the encoding of qcstatements for PSD2" This reverts commit 6c2367080d148f4b8c01f96a4c80e3ac55d1ef26. --- .../lint_qcstatem_psd2_psd2statem_encoding.go | 54 --- ..._qcstatem_psd2_psd2statem_encoding_test.go | 57 ---- .../EvAltRegNumCert56JurContryNotMatching.pem | 28 -- .../EvAltRegNumCert57NtrJurSopMissing.pem | 28 -- testdata/QcStmtPsd2Cert01InvalidRoles.pem | 29 -- testdata/QcStmtPsd2Cert03MissingRolesOid.pem | 29 -- testdata/QcStmtPsd2Cert05Valid.pem | 29 -- testdata/QcStmtPsd2Cert07MissingRoleName.pem | 29 -- testdata/QcStmtPsd2Cert08NcaNameMissing.pem | 28 -- .../QcStmtPsd2Cert09NcaNameZeroLength.pem | 28 -- testdata/QcStmtPsd2Cert10RoleNameMissing.pem | 29 -- .../QcStmtPsd2Cert11RoleNameZeroLenght.pem | 29 -- ...QcStmtPsd2Cert13Psd2ExtNcaIdZeroLength.pem | 29 -- testdata/QcStmtPsd2Cert14Valid.pem | 28 -- .../QcStmtPsd2Cert15NcaIdInconsistent.pem | 29 -- .../QcStmtPsd2Cert17NcaIdInconsistent.pem | 28 -- ...QcStmtPsd2Cert22NcaNameWrongStringType.pem | 29 -- ...tPsd2Cert23Psd2ExtNcaIdWrongStringType.pem | 29 -- .../QcStmtPsd2Cert24RoleNameIllegalChars.pem | 29 -- testdata/QcStmtPsd2Cert26RoleOidAsUtf8Str.pem | 29 -- testdata/QcStmtPsd2Cert27RoleNameNull.pem | 29 -- testdata/QcStmtPsd2Cert28NcaNameIa5Str.pem | 29 -- testdata/QcStmtPsd2Cert30Valid.pem | 29 -- testdata/QcStmtPsd2Cert31Valid.pem | 29 -- testdata/QcStmtPsd2Cert39Valid.pem | 29 -- testdata/QcStmtPsd2Cert40Valid.pem | 29 -- util/alt_reg_num_ev.go | 137 -------- util/misc.go | 22 -- util/oid.go | 56 ++-- util/qc_stmt.go | 313 +++++------------- 30 files changed, 104 insertions(+), 1225 deletions(-) delete mode 100644 lints/etsi/lint_qcstatem_psd2_psd2statem_encoding.go delete mode 100644 lints/etsi/lint_qcstatem_psd2_psd2statem_encoding_test.go delete mode 100644 testdata/EvAltRegNumCert56JurContryNotMatching.pem delete mode 100644 testdata/EvAltRegNumCert57NtrJurSopMissing.pem delete mode 100644 testdata/QcStmtPsd2Cert01InvalidRoles.pem delete mode 100644 testdata/QcStmtPsd2Cert03MissingRolesOid.pem delete mode 100644 testdata/QcStmtPsd2Cert05Valid.pem delete mode 100644 testdata/QcStmtPsd2Cert07MissingRoleName.pem delete mode 100644 testdata/QcStmtPsd2Cert08NcaNameMissing.pem delete mode 100644 testdata/QcStmtPsd2Cert09NcaNameZeroLength.pem delete mode 100644 testdata/QcStmtPsd2Cert10RoleNameMissing.pem delete mode 100644 testdata/QcStmtPsd2Cert11RoleNameZeroLenght.pem delete mode 100644 testdata/QcStmtPsd2Cert13Psd2ExtNcaIdZeroLength.pem delete mode 100644 testdata/QcStmtPsd2Cert14Valid.pem delete mode 100644 testdata/QcStmtPsd2Cert15NcaIdInconsistent.pem delete mode 100644 testdata/QcStmtPsd2Cert17NcaIdInconsistent.pem delete mode 100644 testdata/QcStmtPsd2Cert22NcaNameWrongStringType.pem delete mode 100644 testdata/QcStmtPsd2Cert23Psd2ExtNcaIdWrongStringType.pem delete mode 100644 testdata/QcStmtPsd2Cert24RoleNameIllegalChars.pem delete mode 100644 testdata/QcStmtPsd2Cert26RoleOidAsUtf8Str.pem delete mode 100644 testdata/QcStmtPsd2Cert27RoleNameNull.pem delete mode 100644 testdata/QcStmtPsd2Cert28NcaNameIa5Str.pem delete mode 100644 testdata/QcStmtPsd2Cert30Valid.pem delete mode 100644 testdata/QcStmtPsd2Cert31Valid.pem delete mode 100644 testdata/QcStmtPsd2Cert39Valid.pem delete mode 100644 testdata/QcStmtPsd2Cert40Valid.pem delete mode 100644 util/alt_reg_num_ev.go delete mode 100644 util/misc.go diff --git a/lints/etsi/lint_qcstatem_psd2_psd2statem_encoding.go b/lints/etsi/lint_qcstatem_psd2_psd2statem_encoding.go deleted file mode 100644 index c8e767b0c..000000000 --- a/lints/etsi/lint_qcstatem_psd2_psd2statem_encoding.go +++ /dev/null @@ -1,54 +0,0 @@ -package etsi - -/* - * ZLint Copyright 2020 Regents of the University of Michigan - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy - * of the License at http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -import ( - "github.com/zmap/zcrypto/x509" - "github.com/zmap/zlint/lint" - "github.com/zmap/zlint/util" -) - -type qcStatemPsd2Pd2StatemEnc struct{} - -func (l *qcStatemPsd2Pd2StatemEnc) Initialize() error { - return nil -} - -func (l *qcStatemPsd2Pd2StatemEnc) CheckApplies(c *x509.Certificate) bool { - if !util.IsExtInCert(c, util.QcStateOid) { - return false - } - _, isPresent := util.IsQcStatemPresent(c, &util.IdEtsiPsd2Statem) - return isPresent -} - -func (l *qcStatemPsd2Pd2StatemEnc) Execute(c *x509.Certificate) *lint.LintResult { - qcs := util.ParseQcStatem(util.GetExtFromCert(c, util.QcStateOid).Value, util.IdEtsiPsd2Statem) - if qcs.GetErrorInfo() != "" { - return &lint.LintResult{Status: lint.Error, Details: qcs.GetErrorInfo()} - } - return &lint.LintResult{Status: lint.Pass} -} - -func init() { - lint.RegisterLint(&lint.Lint{ - Name: "e_qcstatem_psd2_psd2statem_encoding", - Description: "This test checks that a PSD2 QcStatement has the correct encoding.", - Citation: "ETSI TS 119 495, 'Annex A (normative): ASN.1 Declaration'", - Source: lint.EtsiEsi, - EffectiveDate: util.EtsiEn319_412_5_V2_2_1_Date, - Lint: &qcStatemPsd2Pd2StatemEnc{}, - }) -} diff --git a/lints/etsi/lint_qcstatem_psd2_psd2statem_encoding_test.go b/lints/etsi/lint_qcstatem_psd2_psd2statem_encoding_test.go deleted file mode 100644 index 4f4295a42..000000000 --- a/lints/etsi/lint_qcstatem_psd2_psd2statem_encoding_test.go +++ /dev/null @@ -1,57 +0,0 @@ -package etsi - -/* - * ZLint Copyright 2020 Regents of the University of Michigan - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy - * of the License at http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -import ( - "github.com/zmap/zlint/lint" - "github.com/zmap/zlint/test" - "testing" -) - -func TestQcStatemPsd2Encoding(t *testing.T) { - m := map[string]lint.LintStatus{ - "QcStmtPsd2Cert01InvalidRoles.pem": lint.Pass, - "QcStmtPsd2Cert03MissingRolesOid.pem": lint.Error, - "QcStmtPsd2Cert05Valid.pem": lint.Pass, - "QcStmtPsd2Cert07MissingRoleName.pem": lint.Error, - "QcStmtPsd2Cert08NcaNameMissing.pem": lint.Error, - "QcStmtPsd2Cert09NcaNameZeroLength.pem": lint.Error, - "QcStmtPsd2Cert10RoleNameMissing.pem": lint.Error, - "QcStmtPsd2Cert11RoleNameZeroLenght.pem": lint.Error, - "QcStmtPsd2Cert13Psd2ExtNcaIdZeroLength.pem": lint.Error, - "QcStmtPsd2Cert14Valid.pem": lint.Pass, - "QcStmtPsd2Cert15NcaIdInconsistent.pem": lint.Pass, - "QcStmtPsd2Cert17NcaIdInconsistent.pem": lint.Pass, - "QcStmtPsd2Cert22NcaNameWrongStringType.pem": lint.Error, - "QcStmtPsd2Cert23Psd2ExtNcaIdWrongStringType.pem": lint.Error, - "QcStmtPsd2Cert24RoleNameIllegalChars.pem": lint.Error, - "QcStmtPsd2Cert26RoleOidAsUtf8Str.pem": lint.Error, - "QcStmtPsd2Cert27RoleNameNull.pem": lint.Error, - "QcStmtPsd2Cert28NcaNameIa5Str.pem": lint.Error, - "QcStmtPsd2Cert30Valid.pem": lint.Pass, - "QcStmtPsd2Cert31Valid.pem": lint.Pass, - "QcStmtPsd2Cert39Valid.pem": lint.Pass, - "QcStmtPsd2Cert40Valid.pem": lint.Pass, - "EvAltRegNumCert56JurContryNotMatching.pem": lint.NA, - "EvAltRegNumCert57NtrJurSopMissing.pem": lint.NA, - } - for inputPath, expected := range m { - out := test.TestLint("e_qcstatem_psd2_psd2statem_encoding", inputPath) - - if out.Status != expected { - t.Errorf("%s: expected %s, got %s", inputPath, expected, out.Status) - } - } -} diff --git a/testdata/EvAltRegNumCert56JurContryNotMatching.pem b/testdata/EvAltRegNumCert56JurContryNotMatching.pem deleted file mode 100644 index 222e0aced..000000000 --- a/testdata/EvAltRegNumCert56JurContryNotMatching.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIExzCCA6+gAwIBAgINAmI1p32s9ypT5AANZzANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjCB -oDEMMAoGA1UECgwDTVRHMRIwEAYDVQQHDAlEYXJtc3RhZHQxDzANBgNVBAgMBkhl -c3NlbjELMAkGA1UEBhMCREUxHTAbBgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9u -MRcwFQYDVQRhDA5OVFJERS0xMjM0NTY3ODERMA8GA1UEBRMIMTIzNDU2NzgxEzAR -BgsrBgEEAYI3PAIBAwwCR0IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB -AQDCDYFxtJQFvM+ZiqpiCPIuY7IeRvkrhZjDg9DOJq12j1znWwUgJSYyGcIkirpp -o+vKEKTzz7XGHvZwWJZbiFJqiEIzhbjGFkhPAUU5P+FquQa17zfbeZ5QkFdDW4vD -NQ2zQfQbwkp/GDw5LU+/K6VxB3MzAOWNNp7+j3LFclYIzIa277ri/Ztcxi2U7S1k -JHfmZ01i25QuKY7dHXrKvGj7FSyAVtPd5zqPmBgUSxHZxAEfuXrQ2a1pEQX2Dq5f -/M3Gs8tNro5FGAqowEARKNzNn3omZ1pHgJvZTPfaX20TgxqRktG5RPdya5dHdHFw -gNPWc792M1xwuG+HNz5+jnXlAgMBAAGjggFcMIIBWDAfBgNVHSMEGDAWgBQMXpz+ -ukshbAQdwlq344hfWd5MEjAdBgNVHQ4EFgQUDmuqg6myTVyFzbHSL4f3IMs2Qzsw -DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwGgYDVR0RBBMwEYIPd3d3LmV4 -YW1wbGUuY29tMGIGCCsGAQUFBwEBBFYwVDAoBggrBgEFBQcwAoYcaHR0cDovL2Nh -LmV4YW1wbGUuY29tL2NhLmNydDAoBggrBgEFBQcwAYYcaHR0cDovL29jc3AuZXhh -bXBsZS5jb20vb2NzcDBZBgNVHSAEUjBQMAcGBWeBDAEBMEUGCisGAQQBvUcNGAEw -NzA1BggrBgEFBQcCARYpaHR0cDovL3d3dy50ZWxlc2VjLmRlL3NlcnZlcnBhc3Mv -Y3BzLmh0bWwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA0GCSqGSIb3 -DQEBCwUAA4IBAQBftKEeTH458M79Zrhf9voF8wTGIh5AEuA8JT/bN2wQDuyqeqme -/QuUX7CIu2WwsPbz8CFe2Q1SKPM5gMlTGufb/beha4zCWqM8NXb4t/hSNDkD9226 -s5FW3lT3TzbDRwl+eykrsIUDWEIYyvg6JI7gK/512QbeTn131lIkUkBnuZ9b7kN3 -cPQ0ekicrCk8FjZz3/H21m7BdvSTF0OmBUseTcrH3azKwqn2AH/RAetJmI9W7HQE -hUunPKM+dSW/NQUD9B1DMs9c8W18vOWnnr5BfzS7kyIxh/Td77wQfyGlMaBeYoq7 -uoXjjS8CsVd+Avbhpda+47g9jZQ94Hcyg96o ------END CERTIFICATE----- diff --git a/testdata/EvAltRegNumCert57NtrJurSopMissing.pem b/testdata/EvAltRegNumCert57NtrJurSopMissing.pem deleted file mode 100644 index e4a944a98..000000000 --- a/testdata/EvAltRegNumCert57NtrJurSopMissing.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEyjCCA7KgAwIBAgINAlEr+EzD49s1YT1+/jANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjCB -ozEMMAoGA1UECgwDTVRHMRIwEAYDVQQHDAlEYXJtc3RhZHQxDzANBgNVBAgMBkhl -c3NlbjELMAkGA1UEBhMCREUxHTAbBgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9u -MRowGAYDVQRhDBFOVFJERStIRS0xMjM0NTY3ODERMA8GA1UEBRMIMTIzNDU2Nzgx -EzARBgsrBgEEAYI3PAIBAwwCREUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQDCDYFxtJQFvM+ZiqpiCPIuY7IeRvkrhZjDg9DOJq12j1znWwUgJSYyGcIk -irppo+vKEKTzz7XGHvZwWJZbiFJqiEIzhbjGFkhPAUU5P+FquQa17zfbeZ5QkFdD -W4vDNQ2zQfQbwkp/GDw5LU+/K6VxB3MzAOWNNp7+j3LFclYIzIa277ri/Ztcxi2U -7S1kJHfmZ01i25QuKY7dHXrKvGj7FSyAVtPd5zqPmBgUSxHZxAEfuXrQ2a1pEQX2 -Dq5f/M3Gs8tNro5FGAqowEARKNzNn3omZ1pHgJvZTPfaX20TgxqRktG5RPdya5dH -dHFwgNPWc792M1xwuG+HNz5+jnXlAgMBAAGjggFcMIIBWDAfBgNVHSMEGDAWgBQM -Xpz+ukshbAQdwlq344hfWd5MEjAdBgNVHQ4EFgQUDmuqg6myTVyFzbHSL4f3IMs2 -QzswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwGgYDVR0RBBMwEYIPd3d3 -LmV4YW1wbGUuY29tMGIGCCsGAQUFBwEBBFYwVDAoBggrBgEFBQcwAoYcaHR0cDov -L2NhLmV4YW1wbGUuY29tL2NhLmNydDAoBggrBgEFBQcwAYYcaHR0cDovL29jc3Au -ZXhhbXBsZS5jb20vb2NzcDBZBgNVHSAEUjBQMAcGBWeBDAEBMEUGCisGAQQBvUcN -GAEwNzA1BggrBgEFBQcCARYpaHR0cDovL3d3dy50ZWxlc2VjLmRlL3NlcnZlcnBh -c3MvY3BzLmh0bWwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA0GCSqG -SIb3DQEBCwUAA4IBAQBmq3MNz+GEqMIqOC1IB06DEjtAFHmbqr9uhxSpUM3VuK9y -jm+upuoZCwXFmEeyRXgjKbVFi6aLcMvyhLKfqntQKP517y/baEOeAV+GHUOYg+Gl -ihXze5o/nZAokPm9/b8D0hciqbxte7UlGaTu9wWKscVpDdjsuClNhaM7QD07LbTG -biAk5cbnQNTKqW0VCCU0LgEPBpbugydWDHkv8a5h0r13jiab3U7sfiX/Zq0rDP+i -MPNIYi/a9b/lxZ+TbFbZ1Q1PSW1dmhLvnXWcCVQ6VW2XwcbNkJyVvbJF3KJXMu7S -djvSAK3WrQazO/XhXQluDOMosMZYJZH4CuLLrHxe ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert01InvalidRoles.pem b/testdata/QcStmtPsd2Cert01InvalidRoles.pem deleted file mode 100644 index f0af97ff8..000000000 --- a/testdata/QcStmtPsd2Cert01InvalidRoles.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE+TCCA+GgAwIBAgINDAL9Kp25SRT/zD2oHzANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAb8wggG7MB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmgYIKwYBBQUHAQMEgY0wgYow -CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA -i+xJAQIwUgYGBACBmCcCMEgwEzARBgcEAIGYJwEBDAZQU1BfUEkMJ0ZlZGVyYWwg -RmluYW5jaWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eQwIREUtQkFGSU4wDQYJKoZI -hvcNAQELBQADggEBACBOt6QdjgWK2amsIFmmf9t7cnwtpigTe3BLnEmsPAPw0TBU -5G0pg1Utep7dvr0k++lMMqAHyxGZ8eUxjxXn/VUFTRisvwuk0GcDiYh7j9D/uyTH -sgD5IOvuADWcxHQ6kRyAWVqu5eLrUIy0l21SfpU1WGLiqCG14RzzljDe7jgWR4vu -KUbk4/LWavRCEXPejDJ7MvQ6Q8Jwj4tzdFZXUdwxQUJ/yp6pwNO3+qka7qi5rHD8 -8tNBPyUevV37humsLjfDzHFINs9D1BMDqZixdGAfOr/rMdw6pUlAUM0nFciYEK6z -sOJ9fnJcGTKWjJeC8XKoOPWyB0Ie0pPy21M5hxQ= ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert03MissingRolesOid.pem b/testdata/QcStmtPsd2Cert03MissingRolesOid.pem deleted file mode 100644 index 957666e36..000000000 --- a/testdata/QcStmtPsd2Cert03MissingRolesOid.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE8DCCA9igAwIBAgINCtgGQhhiIWmoUdvtzDANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAbYwggGyMB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBkQYIKwYBBQUHAQMEgYQwgYEw -CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA -i+xJAQIwSQYGBACBmCcCMD8wCjAIDAZQU1BfUEkMJ0ZlZGVyYWwgRmluYW5jaWFs -IFN1cGVydmlzb3J5IEF1dGhvcml0eQwIREUtQkFGSU4wDQYJKoZIhvcNAQELBQAD -ggEBAAxFzpMwgr+aUxhBzrpsvpZDfaARHczbaPcJmi2h6rThbUFjYbrfssZmiZDq -e5g/4yaRPlKHZFU8yofcAs7hiFQNnKCgK4WlZ9gXe0yylXks6Hn2M2lDMWIk3HmF -ZwsTjyoNbbhW2x70Ewaa2NIWcf+4zK3qGBf4wXqmlhrWsA7EEzswFEUG25qoga2f -NXfJkBKWON7S4K3Bwddull8g2Sl+gJpGlwXlSu1hAV6tBqzH3JniV9AYP3SXAyRQ -S0TalMJ6wkEz+qBxao9+M4E64Q7jgVJbGKvoCgKiTKCbvd24AQDZPgGJspz+3NQR -0DINDw9My5opjNMyB+x4K+Hxtl0= ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert05Valid.pem b/testdata/QcStmtPsd2Cert05Valid.pem deleted file mode 100644 index cae24dcf4..000000000 --- a/testdata/QcStmtPsd2Cert05Valid.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE+TCCA+GgAwIBAgINCqVMvI3ItM3g3XV2cDANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAb8wggG7MB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmgYIKwYBBQUHAQMEgY0wgYow -CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA -i+xJAQIwUgYGBACBmCcCMEgwEzARBgcEAIGYJwEBDAZQU1BfQVMMJ0ZlZGVyYWwg -RmluYW5jaWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eQwIREUtQkFGSU4wDQYJKoZI -hvcNAQELBQADggEBABmbFutzBZssZnMzUDMYf0bYgStey6CMddV4rKhhUDBqxG9s -xg+xLbXNmEHdJ6lScRK3h2mQ222vPsebLguitcisaqAMIDInYfRS657yEXmSedjy -WIVSrtCaAACYoCwOPEymnjra7WsRu2WZZ+5zk7floDx6o5QXLd73DOJrqr/r6pL9 -NPf5e7g+vlVqAGQhC6Z0s7ri5XInPBeZEMox2Au2ZF/UWNRf00MnRvnYAl2TkDSw -HcbU6L8BtzLxJlZmKw33BfTmi++QOmSPZjpELpnpUamrDmKuFlxu5/QBVz6RS/sX -5tZkQTPg6UtFlkStg9LLJEkEvdT0xMkRvczzTPM= ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert07MissingRoleName.pem b/testdata/QcStmtPsd2Cert07MissingRoleName.pem deleted file mode 100644 index 2de38a3d8..000000000 --- a/testdata/QcStmtPsd2Cert07MissingRoleName.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE8TCCA9mgAwIBAgINAn34kicX+AdEJqPEXDANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAbcwggGzMB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBkgYIKwYBBQUHAQMEgYUwgYIw -CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA -i+xJAQIwSgYGBACBmCcCMEAwCzAJBgcEAIGYJwEEDCdGZWRlcmFsIEZpbmFuY2lh -bCBTdXBlcnZpc29yeSBBdXRob3JpdHkMCERFLWJhZmluMA0GCSqGSIb3DQEBCwUA -A4IBAQAHzTrdqGrwO0YNlzUBybkgaiaRR+iTfpe1gBHwOoL3hE6u1xowj3WozX6b -dXi+wT4jiy6ipsSCUE2sMwhBCIGRnuuJzlD6tIqJ88tAL0E13TvL2iW6IvH9pUM6 -ZMfEh7ejIXe2KRPX0lCuaiTwGXZy6B4EEt/vB5kdoqoDDLx7zDYUKyoUetN9bl75 -X5EjnpmZ1b+vgVCui261HFmwCg+ZxEFmbsmx3+CndOvFUygih9bdhIEj6Y6tlZS+ -S958XsWQwdwWnPIICt68yCxjYZfQ5fOiQa4OfoZ82uekJTr7pM63JwAk97GPt+MH -AFexiknCl6FRVuyRQHXkQkQMSfdG ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert08NcaNameMissing.pem b/testdata/QcStmtPsd2Cert08NcaNameMissing.pem deleted file mode 100644 index f9dae78e9..000000000 --- a/testdata/QcStmtPsd2Cert08NcaNameMissing.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEzTCCA7WgAwIBAgINBgcQn55ngMeNmOZhpzANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAZMwggGPMB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBvBggrBgEFBQcBAwRjMGEwCAYG -BACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQAi+xJ -AQIwKQYGBACBmCcCMB8wEzARBgcEAIGYJwEDDAZQU1BfQUkMCERFLUJBRklOMA0G -CSqGSIb3DQEBCwUAA4IBAQBNkBaX1LmQuC7jw/X6iuBwYCvMwCUMjudBa3whU0U0 -jSh8VlzcBAu4dYGglyzhEjibGtHjBR+VW3mels1PCTIe6B4BPsIwnZ3zttjEBHM+ -H/uaShVU+61Cy6xOCGUR0NVyzWThwn0qwi6po0Qqn8+sW53tfTORsXmqaCzmlnDl -LiVJIY4eJYb1iuEucQdJ3KUWduJsJFJHOO+CoJKsoan+1g2cK/3NZC+eLR/e9aC/ -s8SnyGIBf2JxXXDQUY1Nx6Gb7b39Za/Ta6Hzu7Ue1FG/YY3vOwHnESAzmNYV1XiR -QLtIJbag45xPMWzQV5afp0gXRRX4hNE+DkZ52zWBMFTs ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert09NcaNameZeroLength.pem b/testdata/QcStmtPsd2Cert09NcaNameZeroLength.pem deleted file mode 100644 index 3f4f4d268..000000000 --- a/testdata/QcStmtPsd2Cert09NcaNameZeroLength.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEzzCCA7egAwIBAgINDsKzMgts5dOILcyZyzANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAZUwggGRMB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBxBggrBgEFBQcBAwRlMGMwCAYG -BACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQAi+xJ -AQIwKwYGBACBmCcCMCEwEzARBgcEAIGYJwECDAZQU1BfUEkMAAwIREUtQkFGSU4w -DQYJKoZIhvcNAQELBQADggEBAE+Iv9mf7sZBgnYSg739dk8uHRPpNnkkO6cxDvaq -q0CxylX66XdUoXMytvjVB1I+C2u5tmCVYcZYtv+Rm1ctA5FPsgbJNb8BkKH7wNC4 -Z64YSpdDA5hN3S1tudAKlG0JsXZUpOoevDVqqaONnBeQL9aZSF71nFDiRPWGy/Ox -CCYcQINdgRw6KU66b33Qez9oedRvv9SzAQv265H5ACZXJ+d8j0iVypGKUGxhqeQT -/6o1Eg35srYKyEtkYXBk3rOycxrz9Ux6ZhACzbi3v2MgiBVh5MdYuUn2WlBsb9tw -F7avtF38ETrRpx4q8AysD/vckODyvN6zB3PTEeJPS8o7Yr0= ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert10RoleNameMissing.pem b/testdata/QcStmtPsd2Cert10RoleNameMissing.pem deleted file mode 100644 index b6cf298bb..000000000 --- a/testdata/QcStmtPsd2Cert10RoleNameMissing.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE8DCCA9igAwIBAgINDxPCnUBqjv5Cn7YVoTANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAbYwggGyMB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBkQYIKwYBBQUHAQMEgYQwgYEw -CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA -i+xJAQIwSQYGBACBmCcCMD8wCjAIDAZQU1BfQUkMJ0ZlZGVyYWwgRmluYW5jaWFs -IFN1cGVydmlzb3J5IEF1dGhvcml0eQwIREUtQkFGSU4wDQYJKoZIhvcNAQELBQAD -ggEBAAtdv0K46jF555M5IUa//iLMk6bXnqrlBEjbuVMAD2Rq6FvIE56ug4YQfYWI -85f07JhCnnKdw1npx9wF9avLWNggmNpXTPdF10iCXAE4vYEOtVy8xjYgMPk2swoc -VgAzDZQSPAj8nNQSEgYlpLv5o8IQPBMbP6uKjjDilVHEpIPclDlIhx7tfPtGG4/9 -Pvx2FKtnD52Zr5qQvL85IC5Qy2xIIiznLt2p5E131EssZ1zCHDqzo3mYp1YS81Jj -lowIZUtEICht7f0Ju2/RaKgdwivJ2jKHOh23DNkPWsQDbqgMZS2oQCEgikVu4f3d -6fHt4nGCpQGc6jJg2H3n2KR3O9w= ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert11RoleNameZeroLenght.pem b/testdata/QcStmtPsd2Cert11RoleNameZeroLenght.pem deleted file mode 100644 index 934ed5e64..000000000 --- a/testdata/QcStmtPsd2Cert11RoleNameZeroLenght.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE7DCCA9SgAwIBAgINCGnzNrzLAvsCbWMwJjANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAbIwggGuMB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBjQYIKwYBBQUHAQMEgYAwfjAI -BgYEAI5GAQEwEwYGBACORgEGMAkGBwQAjkYBBgMwFQYIKwYBBQUHCwIwCQYHBACL -7EkBAjBGBgYEAIGYJwIwPDANMAsGBwQAgZgnAQEMAAwnRmVkZXJhbCBGaW5hbmNp -YWwgU3VwZXJ2aXNvcnkgQXV0aG9yaXR5DAJERTANBgkqhkiG9w0BAQsFAAOCAQEA -PimK2OFIHTC2lWv6+xN0lUg6cdlyZk1T7N3iBF90WogG1HjDCKnYlILcvOM581p2 -xleu1orGL/VAcJg0Te9rl9Z4ju6z1b4XsjFXSY1QBMxI8gWP2axFYlxcjRS7sMjk -m7lzQL63qGAJm76Gr1Xatcx7peqwgOMmmLN9e0WES+4z2aw2CksUgsaQ2ouzER4r -hXJtVCemhzNKcbeA+8yROD0ROenqDCNqcAGIGJ4YNSp90Wlp63baxu6u3PJgMr9S -L6sZzaimaFEPY6ggiw7PiYAKxmsybKFBXGJBPEaZ5MB4fDGKbe4nEGiEsM56IMBq -7DMKNBB67j4txmUg2xtd6w== ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert13Psd2ExtNcaIdZeroLength.pem b/testdata/QcStmtPsd2Cert13Psd2ExtNcaIdZeroLength.pem deleted file mode 100644 index e723cbf4f..000000000 --- a/testdata/QcStmtPsd2Cert13Psd2ExtNcaIdZeroLength.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE8TCCA9mgAwIBAgINA3NeFoI2mquIfvSjvjANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAbcwggGzMB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBkgYIKwYBBQUHAQMEgYUwgYIw -CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA -i+xJAQIwSgYGBACBmCcCMEAwEzARBgcEAIGYJwEEDAZQU1BfSUMMJ0ZlZGVyYWwg -RmluYW5jaWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eQwAMA0GCSqGSIb3DQEBCwUA -A4IBAQBakOYgnqxhHxCk7/HBK5GOhLc3Cof9e//jriIvA1jjhFO+iO+e1pVMZ9tK -7VFMBSe+v0XzN9oVuSEGdldebMhAnLBzr+ERhzljvXaCuHzh96u2MDbSeErfF4h9 -25BAoeuaglKoUCR/q1w8QMiwW3IxlbdWMeUc3HAVFSSBZtxAqfh6WE5xUaBJBWw5 -b8dixcQcDN9XsedCiZsjIzPUNldc4uQBEplqFbetVjUGyPVgpzwMyHorCyE4kadi -UXX2GNt7erIUgEme0Egmu1J3/R7lkNjXKtfpejTuxLtV6YyF+K5l2ZsWKbDUHNFI -46Tksr06JcmMw6kpWU52vEAh+n4V ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert14Valid.pem b/testdata/QcStmtPsd2Cert14Valid.pem deleted file mode 100644 index 98c54da2b..000000000 --- a/testdata/QcStmtPsd2Cert14Valid.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE1DCCA7ygAwIBAgIND53/U08Ff4UyfPa79TANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAZowggGWMB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjB2BggrBgEFBQcBAwRqMGgwCAYG -BACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQAi+xJ -AQIwMAYGBACBmCcCMCYwEzARBgcEAIGYJwEEDAZQU1BfSUMMBTEyMzQ1DAhERS1C -QUZJTjANBgkqhkiG9w0BAQsFAAOCAQEAHlh68mckSyslsm2Q+in8TW3yFhjZ2/6n -1D/vPzja0LUblklNwKN0Zxa3TsWkKCZh5E/CwaLps/oxNUXDf273I9EFTnaNY0wO -2bcTbwQxkeNKZ7OHcQll8swdD3vhl8koAKAvHPuGJC71orWoc4Cbz6utm2e+IU4X -U1t2PgMPH7GhN/TL/Cqz0xbIcRqkmfLI6dcmckQX+HNBenh546iT/kDY3k6g6tEH -IPHj50A1vgksji5LrLfFhiwMx0X5t/1bPYQaZMKwg8w/mr48ql0gLT48UnLPt2jg -hMklwbWsMn8tTAWqQ3CzGKtgmJO9RWWFyU/jct+Hr7kFrzPG+j4bPg== ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert15NcaIdInconsistent.pem b/testdata/QcStmtPsd2Cert15NcaIdInconsistent.pem deleted file mode 100644 index 1952466e3..000000000 --- a/testdata/QcStmtPsd2Cert15NcaIdInconsistent.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE6TCCA9GgAwIBAgINBXNwOIJE9ou2P9JaNzANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAa8wggGrMB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBigYIKwYBBQUHAQMEfjB8MAgG -BgQAjkYBATATBgYEAI5GAQYwCQYHBACORgEGAzAVBggrBgEFBQcLAjAJBgcEAIvs -SQECMEQGBgQAgZgnAjA6MBMwEQYHBACBmCcBAgwGUFNQX1BJDBtGaW5hbmNpYWwg -Q29uZHVjdCBBdXRob3JpdHkMBkdCLUZDQTANBgkqhkiG9w0BAQsFAAOCAQEAcGLh -qmW9M1HA0kJnhoIcZddPgTSmKgoIhUwPrNJ1R7RJUMkRbJLOGZAOIMz82jUY2pAv -IvtrxSZ9Kj0WeXtNnQ/39TMUogy8rxD3COJCD/n7Jr4vNYYyEeE3WLFMiS9UNJI7 -HPVfknp22f8TRYKYdm7jNqZu8IjFmMp8rBZQgatkEOc01/M2ZlOmbZp4kMcR+QFy -j1emYPjdiT/Sbn2KWFGnbsC9zfSYMr+qri0N9QiS27NJ4Uaj13qj9cvkLHYxuBBp -0SQDYNiU5b10BhonOHuHnf3g9InsIuA6lZibMNIrm+mbJa0YprZBNFesx7gSlrn0 -mA9viD0AJ4F3YeNX4A== ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert17NcaIdInconsistent.pem b/testdata/QcStmtPsd2Cert17NcaIdInconsistent.pem deleted file mode 100644 index 1cb4a6195..000000000 --- a/testdata/QcStmtPsd2Cert17NcaIdInconsistent.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE2zCCA8OgAwIBAgINDR5bwZZ7Cncsu6inkDANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAaEwggGdMB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjB9BggrBgEFBQcBAwRxMG8wCAYG -BACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQAi+xJ -AQIwNwYGBACBmCcCMC0wEzARBgcEAIGYJwEBDAZQU1BfQVMMDU5hdGlvbmFsIEJh -bmsMB1hYLUJBTkswDQYJKoZIhvcNAQELBQADggEBAAhb9Cz45JCQPBJU8DjR7uJi -sCMn79Q3Pu+TbnmR29blkyx/xw3ZuunwgeNXr8hb7+fKRBfXPrtPw/2DtndCIb52 -hbXM98OYoDFyjI3jHhkylce0fyEMrUTGkch63AsI99J2+WPw29hI/tRDoyoX9B6o -YFMHwyEA0En8WzohlhmJ1pBRU3AVeZOB2iIwj4P4yMSw6GzO/JiVFKqiFNRUm4Tc -7bgWDyOJhqnmK0bC5FShD8MwcncBi8YXrtrOC3hiKI4ZM2VVzEtUowMa4ovPDvW+ -lYxzWRwGCFXs8yF/YByhKD5n7Ydj9TtGvLCY89BsI3lvqda19IZwCn70xdlEkUA= ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert22NcaNameWrongStringType.pem b/testdata/QcStmtPsd2Cert22NcaNameWrongStringType.pem deleted file mode 100644 index 5730e39c8..000000000 --- a/testdata/QcStmtPsd2Cert22NcaNameWrongStringType.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE+TCCA+GgAwIBAgINDCggDdySs4DXGHyRDjANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAb8wggG7MB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmgYIKwYBBQUHAQMEgY0wgYow -CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA -i+xJAQIwUgYGBACBmCcCMEgwEzARBgcEAIGYJwEEDAZQU1BfSUMTJ0ZlZGVyYWwg -RmluYW5jaWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eQwIREUtQkFGSU4wDQYJKoZI -hvcNAQELBQADggEBAD7xK3mri61c067i8K6ydtJ0iB/vNYWfP+6BJSPhK2idZ/n4 -MJJTJzJqLmyUrYUjP6QlQmwxS/El81y8VpuXpE3BoOGu7+GSSvcCv7zt9e7tRYmU -TFHK1+yZ18j3g7AzGJIpCT4eKTyGQVPJnhHuZBXdgLcepuyedQ/lg/CCCgVomKmv -04JIUdIoQWVKNGne3rcbjay3g93fnDQ3sWtZEF8j6rQdExBHjZtipkG5TxeOYpg4 -ybC71MTPx3TAa6qFDWUJCqa7oggjS4ew763UR43rvnm3NPwyWvUmnHD47LjzJwBG -KlRvIJttjr6046IX4LxCA+yCo1IdMOBdcaNonF0= ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert23Psd2ExtNcaIdWrongStringType.pem b/testdata/QcStmtPsd2Cert23Psd2ExtNcaIdWrongStringType.pem deleted file mode 100644 index 8a264eafb..000000000 --- a/testdata/QcStmtPsd2Cert23Psd2ExtNcaIdWrongStringType.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE+TCCA+GgAwIBAgINDbqKQigFQMGjP0MDWjANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAb8wggG7MB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmgYIKwYBBQUHAQMEgY0wgYow -CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA -i+xJAQIwUgYGBACBmCcCMEgwEzARBgcEAIGYJwECDAZQU1BfUEkMJ0ZlZGVyYWwg -RmluYW5jaWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eRMIREUtQkFGSU4wDQYJKoZI -hvcNAQELBQADggEBAAlJKsrS/tv3xWC+PcCYGZBLzpJTb1c0ZPrNWxlGOsv0RfTV -7ZTh+bE8G2wwfNKuNcJWbeRm+kj/FxjSMXYHsXyyeJ2mJflYD757DFNzT87o8fDh -wJL7UCTgbIx/OjOYdk0BF8FpLHcHHU/g38xiXQEHGnJx0gcOlUotues3m2j11rZD -IKsaRBYHbyt2Hm0taYCe/S+qGbXAEoTa2ViVvQs1b9XbOE1XQs3+Wfmgg7Pw9/V+ -xdvkg66JCUffw5JK/1YF+wX4ruU9/ZVYJ8izjZ8EqZwZc977LoE67EnOwP4gdk1D -uM2/4uA9EZY6ZriCaYfBAMugfwO8UWQWZhM4YWs= ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert24RoleNameIllegalChars.pem b/testdata/QcStmtPsd2Cert24RoleNameIllegalChars.pem deleted file mode 100644 index 53374b6f2..000000000 --- a/testdata/QcStmtPsd2Cert24RoleNameIllegalChars.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE+TCCA+GgAwIBAgINB3QGTJaVm+8UTeHXtjANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAb8wggG7MB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmgYIKwYBBQUHAQMEgY0wgYow -CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA -i+xJAQIwUgYGBACBmCcCMEgwEzARBgcEAIGYJwEDEwZQU1BfQUkMJ0ZlZGVyYWwg -RmluYW5jaWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eQwIREUtQkFGSU4wDQYJKoZI -hvcNAQELBQADggEBAFOtuuVU/X9VzoMqaHedrNYEc4QQKB02cE/fKNDBINQUSUru -QwJJP8cYsBRPGu2ZzLnCJrqKQZVkVqqhoNbMbIWxuGyqJFSBKrwvTiLcbr2HmIC9 -l/Tn/cfZbCjKURt6fX6UwMghanzcpeMWZqYG2KgpIeVSfvphO1qFryjfPTuxLUy/ -MpwNV1z5un8jizOLeqP0HICoc6i17vPtQGxh1+1DyE+LEU+f44oReVjXkK2p/l3p -43caPV2L371JZlm3GxelU6h6pjKFREpwC7HPQiLUyuHxHwEzRO1Bm+yF8DcFF+lr -68rNsX6FvYmLDvgskgMnM2OcFhHn4h/w1CGI78I= ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert26RoleOidAsUtf8Str.pem b/testdata/QcStmtPsd2Cert26RoleOidAsUtf8Str.pem deleted file mode 100644 index dc77f6160..000000000 --- a/testdata/QcStmtPsd2Cert26RoleOidAsUtf8Str.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFATCCA+mgAwIBAgINBLJlq+HgwVbgQWY4ljANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAccwggHDMB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBogYIKwYBBQUHAQMEgZUwgZIw -CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA -i+xJAQIwWgYGBACBmCcCMFAwGzAZDA8wLjQuMC4xOTQ5NS4xLjEMBlBTUF9BUwwn -RmVkZXJhbCBGaW5hbmNpYWwgU3VwZXJ2aXNvcnkgQXV0aG9yaXR5DAhERS1CQUZJ -TjANBgkqhkiG9w0BAQsFAAOCAQEADwr7eFDj7TDp9oZvLXfQ4fOHGNkPT2IopGZA -XSWOVEQpTDZrmUbEG9VAZRWPQWrsVJBPGMKVSijGfyWOojw+Ybr/zf06udYfzU4z -foX2r2p5VcF7RaOP0I0IvUu7imVO5CGwAAgNwBWHVClxgHCG7HyPCVwfhuloEtBY -pMoYMwZIPQgjbpQv7a0l7sNyowUgvo2LEntgJ+AmYvjtiOril6cB51VjsJvIzhKG -pAUQ6wU9AMZcVrNxKBrBC/ZvBmpNwXWpqZQ0ht8ZLwAwQcFhlduqTj+RaIvKABTT -OdW8/iD8L/05ttgzUYk9hOBP0nvMp0q8YXAnZiLyjzE/b8xwdA== ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert27RoleNameNull.pem b/testdata/QcStmtPsd2Cert27RoleNameNull.pem deleted file mode 100644 index aea0e3d68..000000000 --- a/testdata/QcStmtPsd2Cert27RoleNameNull.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE8jCCA9qgAwIBAgINDT4Uv+ZLx36sX5lt6DANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAbgwggG0MB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBkwYIKwYBBQUHAQMEgYYwgYMw -CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA -i+xJAQIwSwYGBACBmCcCMEEwDDAKBQAMBlBTUF9BUwwnRmVkZXJhbCBGaW5hbmNp -YWwgU3VwZXJ2aXNvcnkgQXV0aG9yaXR5DAhERS1CQUZJTjANBgkqhkiG9w0BAQsF -AAOCAQEALJ21NMFW5+QNjpSsR9S1rWwPU1YH1BtQz492fWpY7Dyow9LyFGzmdR5u -9lvud43yXXkeKiOHNa9V5K9QJwFYlO0F4pj0owkmy1qHnsQqMJMfWjXDBY7wJQBh -ilGtKUAL8ideqJBcwS8GtOkC5uNcJ7IDW0elxbCO9aFPIwv34deM64o6QdwceqK9 -g3Cw+1ZwdL1R9b5Dy9AOuwEuljwN+MKh/uTiqA8oEpTgjwx0GsJuxaVLLcwPmw8u -iwS0g/mbdD8fphQzYW5Blrw4UaWc95rjyZ0p3ML13HXvzKbuvpORbVIu/I83YJ+7 -Ue4OIpzAHeEZCXkQnieJnLCeV7amZg== ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert28NcaNameIa5Str.pem b/testdata/QcStmtPsd2Cert28NcaNameIa5Str.pem deleted file mode 100644 index ebe3714ba..000000000 --- a/testdata/QcStmtPsd2Cert28NcaNameIa5Str.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE+TCCA+GgAwIBAgINCXyBm7L1aR4HaG0t+jANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAxWhcNMjAxMTAxMDgwMzAxWjBw -MQ0wCwYDVQQLDARUZXN0MQwwCgYDVQQKDANNVEcxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEREUt -QkFGSU4tMTIzNDU2Nzg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAb8wggG7MB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmgYIKwYBBQUHAQMEgY0wgYow -CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA -i+xJAQIwUgYGBACBmCcCMEgwEzARBgcEAIGYJwECDAZQU1BfUEkWJ0ZlZGVyYWwg -RmluYW5jaWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eQwIREUtQkFGSU4wDQYJKoZI -hvcNAQELBQADggEBAB+ZT87A/50XIcJbEzJpullrjxpDRm/JFXAcXP8IzYmudG1u -bAQgzmxM60jv8amdE9iFWjO58kp8skX2J7meR8BaPPFZVMQ90RX2IjnUE/aoYlmH -eM9ykwNzTJP72P4i3s5IjKY1+5l9C4YWBHL+GXhdDQDdS6/LMxYjHbaMhjkHicWR -cDMiK16diYjBKn/cb2fjM1gBkwKiHxQj7uxOYn5vCpMQTT1CbQlCDbbzzNbIUvsk -vsUKcjSOV2eXeNZ/5PDh4Z6FY/nM3wiOIPy4A7MUB987Dv/sRJIwvpXubRMVenfe -UMRDoancxKOAp96XNRNlF3pxfsspOIQSASG5Cks= ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert30Valid.pem b/testdata/QcStmtPsd2Cert30Valid.pem deleted file mode 100644 index be1c0749f..000000000 --- a/testdata/QcStmtPsd2Cert30Valid.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE9zCCA9+gAwIBAgINAbqL8/qvSod2/+EpMzANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAwWhcNMjAxMTAxMDgwMzAwWjBv -MQwwCgYDVQQKDANNVEcxDTALBgNVBAsMBFRlc3QxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEeMBwGA1UEYQwVUFNEUEwt -UEZTQS0xMjM0NTY3ODkwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA -wg2BcbSUBbzPmYqqYgjyLmOyHkb5K4WYw4PQziatdo9c51sFICUmMhnCJIq6aaPr -yhCk88+1xh72cFiWW4hSaohCM4W4xhZITwFFOT/harkGte8323meUJBXQ1uLwzUN -s0H0G8JKfxg8OS1PvyulcQdzMwDljTae/o9yxXJWCMyGtu+64v2bXMYtlO0tZCR3 -5mdNYtuULimO3R16yrxo+xUsgFbT3ec6j5gYFEsR2cQBH7l60NmtaREF9g6uX/zN -xrPLTa6ORRgKqMBAESjczZ96JmdaR4Cb2Uz32l9tE4MakZLRuUT3cmuXR3RxcIDT -1nO/djNccLhvhzc+fo515QIDAQABo4IBvjCCAbowHwYDVR0jBBgwFoAUDF6c/rpL -IWwEHcJat+OIX1neTBIwHQYDVR0OBBYEFA5rqoOpsk1chc2x0i+H9yDLNkM7MA4G -A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMBoGA1UdEQQTMBGCD3d3dy5leGFt -cGxlLmNvbTBiBggrBgEFBQcBAQRWMFQwKAYIKwYBBQUHMAKGHGh0dHA6Ly9jYS5l -eGFtcGxlLmNvbS9jYS5jcnQwKAYIKwYBBQUHMAGGHGh0dHA6Ly9vY3NwLmV4YW1w -bGUuY29tL29jc3AwHwYDVR0gBBgwFjAJBgcEAIvsQAEEMAkGBwQAgZgnAwEwHQYD -VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIGZBggrBgEFBQcBAwSBjDCBiTAI -BgYEAI5GAQEwEwYGBACORgEGMAkGBwQAjkYBBgMwFQYIKwYBBQUHCwIwCQYHBACL -7EkBAjBRBgYEAIGYJwIwRzATMBEGBwQAgZgnAQQMBlBTUF9JQwwnRmVkZXJhbCBG -aW5hbmNpYWwgU3VwZXJ2aXNvcnkgQXV0aG9yaXR5DAdQTC1QRlNBMA0GCSqGSIb3 -DQEBCwUAA4IBAQAO1okP2VXl7NmPbdWX9QtesVxlg5e1VDJrx1NA4gVlXPQi8thW -4JAYSmlOMb0IC3CrjcepmApCjBTJnx99Vn6NV9VbpJXdOKgOK+Kf01OPpjte7nV4 -3Q2IhWg75sJKEqMA2DrxCHQmBQ4HplRTE7EqmrM5Kn6QGUT3rjnqfFu9DYY1AeRc -NVxnqAe5TApePwsfqRsX3u2Ngv3rpF/dQgv78VYZbUMWqz2cxlXFKqEu3zWsRdd/ -kvHgNnPh399AzZrkiXzxz2A/eKJnz5ydxe5vswRZ43za4K/pLf/ftnYlbViK/xfk -2TfQdNdte0y60KireEsdNJ27KTEy5XTxast2 ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert31Valid.pem b/testdata/QcStmtPsd2Cert31Valid.pem deleted file mode 100644 index b0cf61348..000000000 --- a/testdata/QcStmtPsd2Cert31Valid.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE9zCCA9+gAwIBAgINB1vxbHmAgLCe5oL7DTANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAwWhcNMjAxMTAxMDgwMzAwWjBw -MQwwCgYDVQQKDANNVEcxDTALBgNVBAsMBFRlc3QxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEfMB0GA1UEYQwWUFNEQkUt -TkJCLTEyMzQuNTY3Ljg5MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMINgXG0lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj -68oQpPPPtcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1 -DbNB9BvCSn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQk -d+ZnTWLblC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8 -zcazy02ujkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA -09Zzv3YzXHC4b4c3Pn6OdeUCAwEAAaOCAb0wggG5MB8GA1UdIwQYMBaAFAxenP66 -SyFsBB3CWrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAO -BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhh -bXBsZS5jb20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eu -ZXhhbXBsZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFt -cGxlLmNvbS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmAYIKwYBBQUHAQMEgYswgYgw -CAYGBACORgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQA -i+xJAQIwUAYGBACBmCcCMEYwEzARBgcEAIGYJwEEDAZQU1BfSUMMJ0ZlZGVyYWwg -RmluYW5jaWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eQwGQkUtTkJCMA0GCSqGSIb3 -DQEBCwUAA4IBAQAPDX5qjIUhlenXeIiZ8uqRiAHEIfH+WAgtG1XwuP4SRL2ndF/g -5r12SLuRXyxaWsJ4qnpv3NFrmrs3yux7FSkk0mSC+67EIdhcA765HIDCKToR9RCN -6R6ZrRJl3DKfnzAA1r82ITtpPsmhhx4l1JJNC3LmAc7owAB1SB4bUw8zymPODlir -feNGECjGFyYi9zi+QN+RS++QAzu0XZsNuT5Ud6vGRPgK/jTjYJsHPW+OSgAC7GOo -Saz0E/uGfmopaYckWTU9UYoUNPjQjTeMWFnwCw8bpo+GUqkkxkFMWkpOHzLWRRXg -5+N8a4HuBcTkai8JKMKqhJ35q+KnF2/LXyM7 ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert39Valid.pem b/testdata/QcStmtPsd2Cert39Valid.pem deleted file mode 100644 index 45fb5357a..000000000 --- a/testdata/QcStmtPsd2Cert39Valid.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE9DCCA9ygAwIBAgINBe1W3McubIstRtJQ2zANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAwWhcNMjAxMTAxMDgwMzAwWjBs -MQwwCgYDVQQKDANNVEcxDTALBgNVBAsMBFRlc3QxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEbMBkGA1UEYQwSUFNETVQt -TUZTQS1BIDEyMzQ1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwg2B -cbSUBbzPmYqqYgjyLmOyHkb5K4WYw4PQziatdo9c51sFICUmMhnCJIq6aaPryhCk -88+1xh72cFiWW4hSaohCM4W4xhZITwFFOT/harkGte8323meUJBXQ1uLwzUNs0H0 -G8JKfxg8OS1PvyulcQdzMwDljTae/o9yxXJWCMyGtu+64v2bXMYtlO0tZCR35mdN -YtuULimO3R16yrxo+xUsgFbT3ec6j5gYFEsR2cQBH7l60NmtaREF9g6uX/zNxrPL -Ta6ORRgKqMBAESjczZ96JmdaR4Cb2Uz32l9tE4MakZLRuUT3cmuXR3RxcIDT1nO/ -djNccLhvhzc+fo515QIDAQABo4IBvjCCAbowHwYDVR0jBBgwFoAUDF6c/rpLIWwE -HcJat+OIX1neTBIwHQYDVR0OBBYEFA5rqoOpsk1chc2x0i+H9yDLNkM7MA4GA1Ud -DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMBoGA1UdEQQTMBGCD3d3dy5leGFtcGxl -LmNvbTBiBggrBgEFBQcBAQRWMFQwKAYIKwYBBQUHMAKGHGh0dHA6Ly9jYS5leGFt -cGxlLmNvbS9jYS5jcnQwKAYIKwYBBQUHMAGGHGh0dHA6Ly9vY3NwLmV4YW1wbGUu -Y29tL29jc3AwHwYDVR0gBBgwFjAJBgcEAIvsQAEEMAkGBwQAgZgnAwEwHQYDVR0l -BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIGZBggrBgEFBQcBAwSBjDCBiTAIBgYE -AI5GAQEwEwYGBACORgEGMAkGBwQAjkYBBgMwFQYIKwYBBQUHCwIwCQYHBACL7EkB -AjBRBgYEAIGYJwIwRzATMBEGBwQAgZgnAQQMBlBTUF9JQwwnRmVkZXJhbCBGaW5h -bmNpYWwgU3VwZXJ2aXNvcnkgQXV0aG9yaXR5DAdNVC1NRlNBMA0GCSqGSIb3DQEB -CwUAA4IBAQA4dTFubbQHH/I52KqmZH5lcPELQOXIylGxfAQxjMeWlkWsNYatZA5F -AkucP7KYtm4KOIMQR+xMreMGqmBGu0cS8HImBgjuld2N6sIgdUtUgWJjPWP2f8dX -Ymt7CMxeV4rPlk6OA3A7k5ymBO+NtK3RCiHluxf8J+vBf5OtuICF9xTkAqblbGFM -akOUy6s+gC085BbvG5gA4W8788WeQLKlPJOolzf21bWpNX+QgWugjHPAJIRdylBH -pwmR7Agg7+mGsPnDgY0955h/upg2TH41qUZw8vkw3LNw7Ij+RLl1ZL/Eni4Fo8xt -oLkacP2gWcr2k4mkJG4uKVyVAsnPIrPG ------END CERTIFICATE----- diff --git a/testdata/QcStmtPsd2Cert40Valid.pem b/testdata/QcStmtPsd2Cert40Valid.pem deleted file mode 100644 index c3d4984c3..000000000 --- a/testdata/QcStmtPsd2Cert40Valid.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE8TCCA9mgAwIBAgINAMgGzG3kIBYA+I8FATANBgkqhkiG9w0BAQsFADBBMRUw -EwYDVQQDDAxUZXN0IFN1YkNBIDIxDTALBgNVBAsMBFRlc3QxDDAKBgNVBAoMA01U -RzELMAkGA1UEBhMCREUwHhcNMTkxMTAxMDgwMzAwWhcNMjAxMTAxMDgwMzAwWjBq -MQwwCgYDVQQKDANNVEcxDTALBgNVBAsMBFRlc3QxEjAQBgNVBAcMCURhcm1zdGFk -dDEPMA0GA1UECAwGSGVzc2VuMQswCQYDVQQGEwJERTEZMBcGA1UEYQwQVkFUQkUt -MDg3Njg2NjE0MjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMINgXG0 -lAW8z5mKqmII8i5jsh5G+SuFmMOD0M4mrXaPXOdbBSAlJjIZwiSKummj68oQpPPP -tcYe9nBYlluIUmqIQjOFuMYWSE8BRTk/4Wq5BrXvN9t5nlCQV0Nbi8M1DbNB9BvC -Sn8YPDktT78rpXEHczMA5Y02nv6PcsVyVgjMhrbvuuL9m1zGLZTtLWQkd+ZnTWLb -lC4pjt0desq8aPsVLIBW093nOo+YGBRLEdnEAR+5etDZrWkRBfYOrl/8zcazy02u -jkUYCqjAQBEo3M2feiZnWkeAm9lM99pfbRODGpGS0blE93Jrl0d0cXCA09Zzv3Yz -XHC4b4c3Pn6OdeUCAwEAAaOCAb0wggG5MB8GA1UdIwQYMBaAFAxenP66SyFsBB3C -WrfjiF9Z3kwSMB0GA1UdDgQWBBQOa6qDqbJNXIXNsdIvh/cgyzZDOzAOBgNVHQ8B -Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAaBgNVHREEEzARgg93d3cuZXhhbXBsZS5j -b20wYgYIKwYBBQUHAQEEVjBUMCgGCCsGAQUFBzAChhxodHRwOi8vY2EuZXhhbXBs -ZS5jb20vY2EuY3J0MCgGCCsGAQUFBzABhhxodHRwOi8vb2NzcC5leGFtcGxlLmNv -bS9vY3NwMB8GA1UdIAQYMBYwCQYHBACL7EABBDAJBgcEAIGYJwMBMB0GA1UdJQQW -MBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmAYIKwYBBQUHAQMEgYswgYgwCAYGBACO -RgEBMBMGBgQAjkYBBjAJBgcEAI5GAQYDMBUGCCsGAQUFBwsCMAkGBwQAi+xJAQIw -UAYGBACBmCcCMEYwEzARBgcEAIGYJwEEDAZQU1BfSUMMJ0ZlZGVyYWwgRmluYW5j -aWFsIFN1cGVydmlzb3J5IEF1dGhvcml0eQwGQkUtTkJCMA0GCSqGSIb3DQEBCwUA -A4IBAQBGHMv35/nt1N94zpYI5/zlBmp8zY4s0JMLmSYRDQCfoMd1CS+7m3JKIrjB -ll5TakTZ8gpY4U5Je/woS/08Lp0bR94Cq/nbMTas0OiOqmkmV8/Kw0mEWS/q2Jol -XUaa4TbvFB0PI7UOsm7tygjfvB9t0zJy+ytDqTiO9WEGouH5dbGDl4//0gq+JUs2 -IFUJi8UntfPnjD/mSmeqOvrsRlNLOgTkhURcLDV5Ch37moni6Mn2VSH/dXStaEUI -ISLK/dcMOBK69wTUXWOLr8HZ5xFPlP+F6gBnVHXSJGvYyE06MDZ2SqWNlS90kwcr -szINuPd+/+Kvij/xKUwX0tMisQ8y ------END CERTIFICATE----- diff --git a/util/alt_reg_num_ev.go b/util/alt_reg_num_ev.go deleted file mode 100644 index 20982f6a2..000000000 --- a/util/alt_reg_num_ev.go +++ /dev/null @@ -1,137 +0,0 @@ -/* - * ZLint Copyright 2020 Regents of the University of Michigan - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy - * of the License at http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package util - -import ( - "encoding/asn1" - "reflect" - "regexp" - - "github.com/zmap/zcrypto/x509" -) - -type RDNSequence []RelativeDistinguishedNameSET - -type RelativeDistinguishedNameSET []AttributeTypeAndValue - -type AttributeTypeAndValue struct { - Type asn1.ObjectIdentifier - Value asn1.RawValue -} - -type parsedSubjectElement struct { - IsPresent bool - Value string - Asn1RawValue asn1.RawValue - ErrorString string -} - -type ParsedEvOrgId struct { - Rsi, Country, StateOrProvince, RegRef string -} - -type cabfOrgIdExt struct { - Rsi string `asn1:"printable"` - Country string `asn1:"printable"` - StateOrProvince string `asn1:"printable,optional,tag:0"` - RegRef string `asn1:"utf8"` -} - -func ParseCabfOrgIdExt(c *x509.Certificate) (string, ParsedEvOrgId) { - var result ParsedEvOrgId - - ext := GetExtFromCert(c, CabfExtensionOrganizationIdentifier) - var parsedExt cabfOrgIdExt - // check that we can parse the extension: - rest, err := asn1.Unmarshal(ext.Value, &parsedExt) - if len(rest) != 0 { - return "trailing bytes after extension", result - } - if err != nil { - return "could not parse extension value:" + err.Error(), result - } - errStr := CheckAsn1Reencoding(reflect.ValueOf(parsedExt).Interface(), ext.Value, "invalid string type in extension") - if errStr != "" { - return "", result - } - result.Country = parsedExt.Country - result.RegRef = parsedExt.RegRef - result.Rsi = parsedExt.Rsi - result.StateOrProvince = parsedExt.StateOrProvince - return "", result -} - -func ParseCabfOrgId(oi string, isEtsi bool) (string, ParsedEvOrgId) { - var result ParsedEvOrgId - re_ntr := regexp.MustCompile(`^(NTR)([A-Z]{2})([+]([A-Z]{2}))?-(.+)$`) - re_vat_psd := regexp.MustCompile(`^(VAT|PSD)([A-Z]{2})(())-(.+)$`) - re_lei := regexp.MustCompile(`^(LEI)(XG)(())-(.+)$`) - var sm []string - if re_ntr.MatchString(oi) { - sm = re_ntr.FindStringSubmatch(oi) - } else if re_vat_psd.MatchString(oi) { - sm = re_vat_psd.FindStringSubmatch(oi) - } else if re_lei.MatchString(oi) { - if isEtsi { - sm = re_lei.FindStringSubmatch(oi) - } else { - return "CAB/F subject:organizationIdentifier does not allow LEI", result - } - } else { - return "CAB/F subject:organizationIdentifier has an invalid format", result - } - result.Rsi = sm[1] - result.Country = sm[2] - result.StateOrProvince = sm[3] - result.RegRef = sm[5] - return "", result - -} - -func GetSubjectOrgId(rawSubject []byte) parsedSubjectElement { - return GetSubjectElement(rawSubject, CabfSubjectOrganizationIdentifier) -} -func GetSubjectElement(rawSubject []byte, soughtOid asn1.ObjectIdentifier) parsedSubjectElement { - result := parsedSubjectElement{IsPresent: false, Value: "", ErrorString: ""} - var nl RDNSequence - - rest, err := asn1.Unmarshal(rawSubject, &nl) // parse the sequence of sets, i.e. each list element in nl will be a set - if err != nil { - return parsedSubjectElement{IsPresent: false, Value: "", ErrorString: "error parsing outer SEQ of subject DN"} - } - if len(rest) != 0 { - return parsedSubjectElement{IsPresent: false, ErrorString: "rest len of outer seq != 0 in subject DN", Value: ""} - } - for _, item := range nl { - for _, typeAndValue := range item { - if typeAndValue.Type.Equal(soughtOid) { - if result.IsPresent { - AppendToStringSemicolonDelim(&result.ErrorString, "double AVA found in subject:... encountered, this is not expected") - return result - } - result.IsPresent = true - var parsedString string - _, _ = asn1.Unmarshal(typeAndValue.Value.FullBytes, &parsedString) - result.Value = parsedString - result.Asn1RawValue = typeAndValue.Value - } - } - } - return result -} - -type ParsedOrgId struct { - Rsi, Country, SubDiv, RegRef string -} diff --git a/util/misc.go b/util/misc.go deleted file mode 100644 index 34d273546..000000000 --- a/util/misc.go +++ /dev/null @@ -1,22 +0,0 @@ -/* - * ZLint Copyright 2020 Regents of the University of Michigan - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy - * of the License at http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package util - -func AppendToStringSemicolonDelim(this *string, s string) { - if len(*this) > 0 && len(s) > 0 { - (*this) += "; " - } - (*this) += s -} diff --git a/util/oid.go b/util/oid.go index d2e0101a9..f52b2fb75 100644 --- a/util/oid.go +++ b/util/oid.go @@ -71,41 +71,27 @@ var ( SHA384OID = asn1.ObjectIdentifier{2, 16, 840, 1, 101, 3, 4, 2, 2} SHA512OID = asn1.ObjectIdentifier{2, 16, 840, 1, 101, 3, 4, 2, 3} // other OIDs - OidRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 1} - OidRSASSAPSS = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 10} - OidMD2WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 2} - OidMD5WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 4} - OidSHA1WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 5} - OidSHA224WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 14} - OidSHA256WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 11} - OidSHA384WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 12} - OidSHA512WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 13} - AnyPolicyOID = asn1.ObjectIdentifier{2, 5, 29, 32, 0} - UserNoticeOID = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 2, 2} - CpsOID = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 2, 1} - IdEtsiQcsQcCompliance = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 1} - IdEtsiQcsQcLimitValue = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 2} - IdEtsiQcsQcRetentionPeriod = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 3} - IdEtsiQcsQcSSCD = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 4} - IdEtsiQcsQcEuPDS = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 5} - IdEtsiQcsQcType = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 6} - IdEtsiQcsQctEsign = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 6, 1} - IdEtsiQcsQctEseal = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 6, 2} - IdEtsiQcsQctWeb = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 6, 3} - IdEtsiPsd2Statem = asn1.ObjectIdentifier{0, 4, 0, 19495, 2} - IdEtsiPsd2RolePspAs = asn1.ObjectIdentifier{0, 4, 0, 19495, 1, 1} - IdEtsiPsd2RolePspPi = asn1.ObjectIdentifier{0, 4, 0, 19495, 1, 2} - IdEtsiPsd2RolePspAi = asn1.ObjectIdentifier{0, 4, 0, 19495, 1, 3} - IdEtsiPsd2RolePspIc = asn1.ObjectIdentifier{0, 4, 0, 19495, 1, 4} - IdEtsiQcsSemanticsIdLegal = asn1.ObjectIdentifier{0, 4, 0, 194121, 1, 2} - IdEtsiPolicyQcpNatural = asn1.ObjectIdentifier{0, 4, 0, 194112, 1, 0} - IdEtsiPolicyQcpLegal = asn1.ObjectIdentifier{0, 4, 0, 194112, 1, 1} - IdEtsiPolicyQcpNaturalQscd = asn1.ObjectIdentifier{0, 4, 0, 194112, 1, 2} - IdEtsiPolicyQcpLegalQscd = asn1.ObjectIdentifier{0, 4, 0, 194112, 1, 3} - IdEtsiPolicyQcpWeb = asn1.ObjectIdentifier{0, 4, 0, 194112, 1, 4} - IdQcsPkixQCSyntaxV2 = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 11, 2} - CabfSubjectOrganizationIdentifier = asn1.ObjectIdentifier{2, 5, 4, 97} - CabfExtensionOrganizationIdentifier = asn1.ObjectIdentifier{2, 23, 140, 3, 1} + OidRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 1} + OidRSASSAPSS = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 10} + OidMD2WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 2} + OidMD5WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 4} + OidSHA1WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 5} + OidSHA224WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 14} + OidSHA256WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 11} + OidSHA384WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 12} + OidSHA512WithRSAEncryption = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 13} + AnyPolicyOID = asn1.ObjectIdentifier{2, 5, 29, 32, 0} + UserNoticeOID = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 2, 2} + CpsOID = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 2, 1} + IdEtsiQcsQcCompliance = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 1} + IdEtsiQcsQcLimitValue = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 2} + IdEtsiQcsQcRetentionPeriod = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 3} + IdEtsiQcsQcSSCD = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 4} + IdEtsiQcsQcEuPDS = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 5} + IdEtsiQcsQcType = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 6} + IdEtsiQcsQctEsign = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 6, 1} + IdEtsiQcsQctEseal = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 6, 2} + IdEtsiQcsQctWeb = asn1.ObjectIdentifier{0, 4, 0, 1862, 1, 6, 3} ) const ( diff --git a/util/qc_stmt.go b/util/qc_stmt.go index e2f3b3ab8..156210f50 100644 --- a/util/qc_stmt.go +++ b/util/qc_stmt.go @@ -19,21 +19,8 @@ import ( "encoding/asn1" "fmt" "reflect" - "unicode" - - "github.com/zmap/zcrypto/x509" ) -var EtsiQcStmtOidList = [...]*asn1.ObjectIdentifier{ - &IdEtsiQcsQcCompliance, - &IdEtsiQcsQcLimitValue, - &IdEtsiQcsQcRetentionPeriod, - &IdEtsiQcsQcSSCD, - &IdEtsiQcsQcEuPDS, - &IdEtsiQcsQcType, - &IdEtsiPsd2Statem, -} - type anyContent struct { Raw asn1.RawContent } @@ -42,12 +29,10 @@ type qcStatementWithInfoField struct { Oid asn1.ObjectIdentifier Any asn1.RawValue } - type qcStatementWithoutInfoField struct { Oid asn1.ObjectIdentifier } -// === etsi base ==> type etsiBase struct { errorInfo string isPresent bool @@ -61,8 +46,6 @@ func (this etsiBase) IsPresent() bool { return this.isPresent } -// <== etsi base === - type EtsiQcStmtIf interface { GetErrorInfo() string IsPresent() bool @@ -114,76 +97,16 @@ type EtsiQcPds struct { PdsLocations []PdsLocation } -// ==== QcStatement 2 (RFC3739)types ===> - -type DecodedQcS2 struct { - etsiBase - Decoded QcStatemt2 -} -type QcStatemt2 struct { - SemanticsId asn1.ObjectIdentifier `asn1:"optional"` - NameRegAuthorities NameRegistrationAuthorities `asn1:"optional"` -} - -type NameRegistrationAuthorities []asn1.RawValue - -// <=== QcStatement 2 (RFC3739)types ==== - -// ==== PSD2 QcStatement types ===> -type Psd2RoleOfPspType int - -const ( - RoleAs Psd2RoleOfPspType = 1 - RolePi Psd2RoleOfPspType = 2 - RoleAi Psd2RoleOfPspType = 3 - RoleIc Psd2RoleOfPspType = 4 -) - -// === ASN.1 Types ==> -type Psd2RoleOfPsp struct { - RoleType asn1.ObjectIdentifier - RoleOfPspName string `asn1:"utf8"` -} - -type EtsiPsd2QcStatem struct { - Roles []Psd2RoleOfPsp - NCAName string `asn1:"utf8"` - CountryAndNCAId string `asn1:"utf8"` -} - -// <== ASN.1 Types === - -type EtsiPsd2 struct { - etsiBase - DecodedPsd2Statm EtsiPsd2QcStatem -} - -func (this EtsiPsd2) getCountryAndNcaId() (string, string) { - runes := []rune(this.DecodedPsd2Statm.CountryAndNCAId) - if len(this.DecodedPsd2Statm.CountryAndNCAId) < 4 || !unicode.IsUpper(runes[0]) || !unicode.IsUpper(runes[1]) || runes[2] != '-' { - return "", "" +func AppendToStringSemicolonDelim(this *string, s string) { + if len(*this) > 0 && len(s) > 0 { + (*this) += "; " } - return string(runes[0:2]), string(runes[3:]) -} - -func (this EtsiPsd2) GetNcaCountry() string { - co, _ := this.getCountryAndNcaId() - return co + (*this) += s } -func (this EtsiPsd2) GetNcaId() string { - _, ncaId := this.getCountryAndNcaId() - return ncaId -} - -// <=== PSD2 QcStatement types ==== -func CheckAsn1Reencoding(i interface{}, originalEncoding []byte, appendIfComparisonFails string) string { - return CheckAsn1ReencodingWithParams(i, originalEncoding, appendIfComparisonFails, "") -} - -func CheckAsn1ReencodingWithParams(i interface{}, originalEncoding []byte, appendIfComparisonFails string, params string) string { +func checkAsn1Reencoding(i interface{}, originalEncoding []byte, appendIfComparisonFails string) string { result := "" - reencoded, marshErr := asn1.MarshalWithParams(i, params) + reencoded, marshErr := asn1.Marshal(i) if marshErr != nil { AppendToStringSemicolonDelim(&result, fmt.Sprintf("error reencoding ASN1 value of statementInfo field: %s", marshErr)) @@ -194,12 +117,15 @@ func CheckAsn1ReencodingWithParams(i interface{}, originalEncoding []byte, appen return result } -type EtsiPsd2OrgId struct { - Rsi, Country, NcaId, PspId string -} - func IsAnyEtsiQcStatementPresent(extVal []byte) bool { - for _, oid := range EtsiQcStmtOidList { + oidList := make([]*asn1.ObjectIdentifier, 6) + oidList[0] = &IdEtsiQcsQcCompliance + oidList[1] = &IdEtsiQcsQcLimitValue + oidList[2] = &IdEtsiQcsQcRetentionPeriod + oidList[3] = &IdEtsiQcsQcSSCD + oidList[4] = &IdEtsiQcsQcEuPDS + oidList[5] = &IdEtsiQcsQcType + for _, oid := range oidList { r := ParseQcStatem(extVal, *oid) if r.IsPresent() { return true @@ -208,17 +134,6 @@ func IsAnyEtsiQcStatementPresent(extVal []byte) bool { return false } -func IsQcStatemPresent(c *x509.Certificate, oid *asn1.ObjectIdentifier) (string, bool) { - if !IsExtInCert(c, QcStateOid) { - return "", false - } - qcs := ParseQcStatem(GetExtFromCert(c, QcStateOid).Value, *oid) - if qcs.GetErrorInfo() != "" { - return qcs.GetErrorInfo(), qcs.IsPresent() - } - return "", qcs.IsPresent() -} - //nolint:gocyclo func ParseQcStatem(extVal []byte, sought asn1.ObjectIdentifier) EtsiQcStmtIf { sl := make([]anyContent, 0) @@ -254,147 +169,85 @@ func ParseQcStatem(extVal []byte, sought asn1.ObjectIdentifier) EtsiQcStmtIf { continue } if statem.Oid.Equal(IdEtsiQcsQcCompliance) { - return handleIdEtsiQcsQcCompliance(statem, raw) + etsiObj := Etsi421QualEuCert{etsiBase: etsiBase{isPresent: true}} + statemWithoutInfo := qcStatementWithoutInfoField{Oid: statem.Oid} + AppendToStringSemicolonDelim(&etsiObj.errorInfo, checkAsn1Reencoding(reflect.ValueOf(statemWithoutInfo).Interface(), raw.Raw, + "invalid format of ETSI Complicance statement")) + return etsiObj } else if statem.Oid.Equal(IdEtsiQcsQcLimitValue) { - return handleIdEtsiQcsQcLimitValue(statem) + etsiObj := EtsiQcLimitValue{etsiBase: etsiBase{isPresent: true}} + numErr := false + alphErr := false + var numeric EtsiMonetaryValueNum + var alphabetic EtsiMonetaryValueAlph + restNum, errNum := asn1.Unmarshal(statem.Any.FullBytes, &numeric) + if len(restNum) != 0 || errNum != nil { + numErr = true + } else { + etsiObj.IsNum = true + etsiObj.Amount = numeric.Amount + etsiObj.Exponent = numeric.Exponent + etsiObj.CurrencyNum = numeric.Iso4217CurrencyCodeNum + + } + if numErr { + restAlph, errAlph := asn1.Unmarshal(statem.Any.FullBytes, &alphabetic) + if len(restAlph) != 0 || errAlph != nil { + alphErr = true + } else { + etsiObj.IsNum = false + etsiObj.Amount = alphabetic.Amount + etsiObj.Exponent = alphabetic.Exponent + etsiObj.CurrencyAlph = alphabetic.Iso4217CurrencyCodeAlph + AppendToStringSemicolonDelim(&etsiObj.errorInfo, + checkAsn1Reencoding(reflect.ValueOf(alphabetic).Interface(), + statem.Any.FullBytes, "error with ASN.1 encoding, possibly a wrong ASN.1 string type was used")) + } + } + if numErr && alphErr { + etsiObj.errorInfo = "error parsing the ETSI Qc Statement statementInfo field" + } + return etsiObj + } else if statem.Oid.Equal(IdEtsiQcsQcRetentionPeriod) { - return handleIdEtsiQcsQcRetentionPeriod(statem) + etsiObj := EtsiQcRetentionPeriod{etsiBase: etsiBase{isPresent: true}} + rest, err := asn1.Unmarshal(statem.Any.FullBytes, &etsiObj.Period) + + if len(rest) != 0 || err != nil { + etsiObj.errorInfo = "error parsing the statementInfo field" + } + return etsiObj } else if statem.Oid.Equal(IdEtsiQcsQcSSCD) { - return handleIdEtsiQcsQcSSCD(statem, raw) + etsiObj := EtsiQcSscd{etsiBase: etsiBase{isPresent: true}} + statemWithoutInfo := qcStatementWithoutInfoField{Oid: statem.Oid} + AppendToStringSemicolonDelim(&etsiObj.errorInfo, checkAsn1Reencoding(reflect.ValueOf(statemWithoutInfo).Interface(), raw.Raw, + "invalid format of ETSI SCSD statement")) + return etsiObj } else if statem.Oid.Equal(IdEtsiQcsQcEuPDS) { - return handleIdEtsiQcsQcEuPDS(statem) + etsiObj := EtsiQcPds{etsiBase: etsiBase{isPresent: true}} + rest, err := asn1.Unmarshal(statem.Any.FullBytes, &etsiObj.PdsLocations) + if len(rest) != 0 || err != nil { + etsiObj.errorInfo = "error parsing the statementInfo field" + } else { + AppendToStringSemicolonDelim(&etsiObj.errorInfo, + checkAsn1Reencoding(reflect.ValueOf(etsiObj.PdsLocations).Interface(), statem.Any.FullBytes, + "error with ASN.1 encoding, possibly a wrong ASN.1 string type was used")) + } + return etsiObj } else if statem.Oid.Equal(IdEtsiQcsQcType) { - return handleIdEtsiQcsQcType(statem) - } else if statem.Oid.Equal(IdEtsiPsd2Statem) { - return handleIdEtsiPsd2Statem(statem) - } else if statem.Oid.Equal(IdQcsPkixQCSyntaxV2) { - return handleIdQcsPkixQCSyntaxV2(statem) + var qcType Etsi423QcType + qcType.isPresent = true + rest, err := asn1.Unmarshal(statem.Any.FullBytes, &qcType.TypeOids) + if len(rest) != 0 || err != nil { + return etsiBase{errorInfo: "error parsing IdEtsiQcsQcType extension statementInfo field", isPresent: true} + } + return qcType } else { return etsiBase{errorInfo: "", isPresent: true} } - } - - return etsiBase{errorInfo: "", isPresent: false} -} - -func handleIdQcsPkixQCSyntaxV2(statem qcStatementWithInfoField) EtsiQcStmtIf { - var qcs2Statem DecodedQcS2 - qcs2Statem.isPresent = true - if len(statem.Any.FullBytes) == 0 { - return qcs2Statem - } - rest, err := asn1.Unmarshal(statem.Any.FullBytes, &qcs2Statem.Decoded) - if err != nil { - AppendToStringSemicolonDelim(&qcs2Statem.errorInfo, "error parsing statement: "+err.Error()) - } - if len(rest) != 0 { - AppendToStringSemicolonDelim(&qcs2Statem.errorInfo, "trailing bytes after QcStatement") - } - return qcs2Statem -} -func handleIdEtsiPsd2Statem(statem qcStatementWithInfoField) EtsiQcStmtIf { - var psd2Statem EtsiPsd2 - psd2Statem.isPresent = true - rest, err := asn1.Unmarshal(statem.Any.FullBytes, &psd2Statem.DecodedPsd2Statm) - if len(rest) != 0 || err != nil { - return etsiBase{errorInfo: "error parsing IdEtsiPsd2Statem extension statementInfo field", isPresent: true} } - if psd2Statem.DecodedPsd2Statm.CountryAndNCAId == "" || psd2Statem.DecodedPsd2Statm.NCAName == "" { - AppendToStringSemicolonDelim(&psd2Statem.errorInfo, "field has length 0") - } - for _, role := range psd2Statem.DecodedPsd2Statm.Roles { - if role.RoleOfPspName == "" { - AppendToStringSemicolonDelim(&psd2Statem.errorInfo, "field has length 0") - } - } - AppendToStringSemicolonDelim(&psd2Statem.errorInfo, - CheckAsn1Reencoding(reflect.ValueOf(psd2Statem.DecodedPsd2Statm).Interface(), statem.Any.FullBytes, - "error with ASN.1 encoding, possibly a wrong ASN.1 string type was used")) - return psd2Statem -} -func handleIdEtsiQcsQcType(statem qcStatementWithInfoField) EtsiQcStmtIf { - var qcType Etsi423QcType - qcType.isPresent = true - rest, err := asn1.Unmarshal(statem.Any.FullBytes, &qcType.TypeOids) - if len(rest) != 0 || err != nil { - return etsiBase{errorInfo: "error parsing IdEtsiQcsQcType extension statementInfo field", isPresent: true} - } - return qcType -} - -func handleIdEtsiQcsQcEuPDS(statem qcStatementWithInfoField) EtsiQcStmtIf { - etsiObj := EtsiQcPds{etsiBase: etsiBase{isPresent: true}} - rest, err := asn1.Unmarshal(statem.Any.FullBytes, &etsiObj.PdsLocations) - if len(rest) != 0 || err != nil { - etsiObj.errorInfo = "error parsing the statementInfo field" - } else { - AppendToStringSemicolonDelim(&etsiObj.errorInfo, - CheckAsn1Reencoding(reflect.ValueOf(etsiObj.PdsLocations).Interface(), statem.Any.FullBytes, - "error with ASN.1 encoding, possibly a wrong ASN.1 string type was used")) - } - return etsiObj -} - -func handleIdEtsiQcsQcSSCD(statem qcStatementWithInfoField, raw anyContent) EtsiQcStmtIf { - etsiObj := EtsiQcSscd{etsiBase: etsiBase{isPresent: true}} - statemWithoutInfo := qcStatementWithoutInfoField{Oid: statem.Oid} - AppendToStringSemicolonDelim(&etsiObj.errorInfo, CheckAsn1Reencoding(reflect.ValueOf(statemWithoutInfo).Interface(), raw.Raw, - "invalid format of ETSI SCSD statement")) - return etsiObj -} - -func handleIdEtsiQcsQcRetentionPeriod(statem qcStatementWithInfoField) EtsiQcStmtIf { - etsiObj := EtsiQcRetentionPeriod{etsiBase: etsiBase{isPresent: true}} - rest, err := asn1.Unmarshal(statem.Any.FullBytes, &etsiObj.Period) - - if len(rest) != 0 || err != nil { - etsiObj.errorInfo = "error parsing the statementInfo field" - } - return etsiObj -} - -func handleIdEtsiQcsQcLimitValue(statem qcStatementWithInfoField) EtsiQcStmtIf { - etsiObj := EtsiQcLimitValue{etsiBase: etsiBase{isPresent: true}} - numErr := false - alphErr := false - var numeric EtsiMonetaryValueNum - var alphabetic EtsiMonetaryValueAlph - restNum, errNum := asn1.Unmarshal(statem.Any.FullBytes, &numeric) - if len(restNum) != 0 || errNum != nil { - numErr = true - } else { - etsiObj.IsNum = true - etsiObj.Amount = numeric.Amount - etsiObj.Exponent = numeric.Exponent - etsiObj.CurrencyNum = numeric.Iso4217CurrencyCodeNum - - } - if numErr { - restAlph, errAlph := asn1.Unmarshal(statem.Any.FullBytes, &alphabetic) - if len(restAlph) != 0 || errAlph != nil { - alphErr = true - } else { - etsiObj.IsNum = false - etsiObj.Amount = alphabetic.Amount - etsiObj.Exponent = alphabetic.Exponent - etsiObj.CurrencyAlph = alphabetic.Iso4217CurrencyCodeAlph - AppendToStringSemicolonDelim(&etsiObj.errorInfo, - CheckAsn1Reencoding(reflect.ValueOf(alphabetic).Interface(), - statem.Any.FullBytes, "error with ASN.1 encoding, possibly a wrong ASN.1 string type was used")) - } - } - if numErr && alphErr { - etsiObj.errorInfo = "error parsing the ETSI Qc Statement statementInfo field" - } - return etsiObj -} + return etsiBase{errorInfo: "", isPresent: false} -func handleIdEtsiQcsQcCompliance(statem qcStatementWithInfoField, raw anyContent) EtsiQcStmtIf { - etsiObj := Etsi421QualEuCert{etsiBase: etsiBase{isPresent: true}} - statemWithoutInfo := qcStatementWithoutInfoField{Oid: statem.Oid} - AppendToStringSemicolonDelim(&etsiObj.errorInfo, CheckAsn1Reencoding(reflect.ValueOf(statemWithoutInfo).Interface(), raw.Raw, - "invalid format of ETSI Complicance statement")) - return etsiObj } From e56e2a09361056ae4f3d9ed9e03624bfbe2fb0cb Mon Sep 17 00:00:00 2001 From: GitHub Date: Thu, 21 Oct 2021 07:26:00 +0000 Subject: [PATCH 03/12] util: gtld_map autopull updates for 2021-10-21T07:25:20 UTC --- v3/util/gtld_map.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/util/gtld_map.go b/v3/util/gtld_map.go index 9b952c603..942f4b988 100644 --- a/v3/util/gtld_map.go +++ b/v3/util/gtld_map.go @@ -5161,7 +5161,7 @@ var tldMap = map[string]GTLDPeriod{ "qvc": { GTLD: "qvc", DelegationDate: "2016-08-04", - RemovalDate: "", + RemovalDate: "2021-10-07", }, "racing": { GTLD: "racing", From 92e659c5aefeeea3afd8a32cc768b112a9355218 Mon Sep 17 00:00:00 2001 From: mtgag Date: Thu, 27 Apr 2023 08:55:54 +0200 Subject: [PATCH 04/12] always check and perform the operation in the execution --- .../rfc/lint_cert_unique_identifier_version_not_2_or_3.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v3/lints/rfc/lint_cert_unique_identifier_version_not_2_or_3.go b/v3/lints/rfc/lint_cert_unique_identifier_version_not_2_or_3.go index f6c982b7c..9aba2ba08 100644 --- a/v3/lints/rfc/lint_cert_unique_identifier_version_not_2_or_3.go +++ b/v3/lints/rfc/lint_cert_unique_identifier_version_not_2_or_3.go @@ -52,11 +52,11 @@ func NewCertUniqueIdVersion() lint.LintInterface { } func (l *certUniqueIdVersion) CheckApplies(c *x509.Certificate) bool { - return c.IssuerUniqueId.Bytes != nil || c.SubjectUniqueId.Bytes != nil + return true } func (l *certUniqueIdVersion) Execute(c *x509.Certificate) *lint.LintResult { - if (c.Version) != 2 && (c.Version) != 3 { + if (c.IssuerUniqueId.Bytes != nil || c.SubjectUniqueId.Bytes != nil) && (c.Version) != 2 && (c.Version) != 3 { return &lint.LintResult{Status: lint.Error} } else { return &lint.LintResult{Status: lint.Pass} From 1652cfa597d7c4c37991484d35e4a6da57a06580 Mon Sep 17 00:00:00 2001 From: mtgag Date: Wed, 5 Jul 2023 07:03:20 +0200 Subject: [PATCH 05/12] synchronised with project --- h | 531 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 531 insertions(+) create mode 100644 h diff --git a/h b/h new file mode 100644 index 000000000..5d88c51e5 --- /dev/null +++ b/h @@ -0,0 +1,531 @@ +commit 92902fc7d9ae7ad9f221235c74b992be6f101812 (HEAD -> master, origin/master, origin/HEAD) +Merge: 526f9be 8c46bdf +Author: mtgag +Date: Sat Jul 1 09:28:04 2023 +0200 + + Merge https://github.com/zmap/zlint + +commit 8c46bdf0e6c8f3ccab7d3101cbf56eea9b7a856a +Author: Aaron Gable +Date: Fri Jun 30 12:56:49 2023 -0700 + + Fix typo in LintRevocationListEx comment (#730) + +commit 7ef1f8451ba9894bb27645321618de2bf9a158be +Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> +Date: Sun Jun 25 16:11:22 2023 -0700 + + util: gtld_map autopull updates for 2023-06-14T22:18:50 UTC (#727) + + Co-authored-by: GitHub + Co-authored-by: Christopher Henderson + +commit 5e0219d2a818f0d8c71f20191d79e010890c2269 +Author: MTG <36234449+mtgag@users.noreply.github.com> +Date: Mon Jun 26 01:02:29 2023 +0200 + + Bc critical (#722) + + * lint about the encoding of qcstatements for PSD2 + + * Revert "lint about the encoding of qcstatements for PSD2" + + This reverts commit 6c2367080d148f4b8c01f96a4c80e3ac55d1ef26. + + * util: gtld_map autopull updates for 2021-10-21T07:25:20 UTC + + * always check and perform the operation in the execution + + * returning fatal rather than na + + * Update v3/lints/rfc/lint_basic_constraints_not_critical.go + + Error instead of fatal + + Co-authored-by: Christopher Henderson + + * adding error description. + + --------- + + Co-authored-by: mtg + Co-authored-by: GitHub + Co-authored-by: Christopher Henderson + +commit 3746088f87cde72a751b8f8a68c9b0a9e9a6a8b0 +Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> +Date: Sun Jun 11 12:21:00 2023 -0700 + + util: gtld_map autopull updates for 2023-06-06T18:20:14 UTC (#698) + + Co-authored-by: GitHub + Co-authored-by: Zakir Durumeric + +commit 9b18bdcd8fedb5013bda10ba13de27e3bf4ed908 +Author: MTG <36234449+mtgag@users.noreply.github.com> +Date: Sun Jun 11 21:13:48 2023 +0200 + + Ca field empty description (#723) + + * lint about the encoding of qcstatements for PSD2 + + * Revert "lint about the encoding of qcstatements for PSD2" + + This reverts commit 6c2367080d148f4b8c01f96a4c80e3ac55d1ef26. + + * util: gtld_map autopull updates for 2021-10-21T07:25:20 UTC + + * always check and perform the operation in the execution + + * simply must not have a non-empty distinguished name should suffice. The field is always present, the lints tests if the Sequence is empty. + + --------- + + Co-authored-by: mtg + Co-authored-by: GitHub + Co-authored-by: Christopher Henderson + +commit 59a91a2b1b7562e80894103cf8f8e03319b82a92 +Author: MTG <36234449+mtgag@users.noreply.github.com> +Date: Sun Jun 11 21:02:42 2023 +0200 + + Max length check applies (#724) + + * lint about the encoding of qcstatements for PSD2 + + * Revert "lint about the encoding of qcstatements for PSD2" + + This reverts commit 6c2367080d148f4b8c01f96a4c80e3ac55d1ef26. + + * util: gtld_map autopull updates for 2021-10-21T07:25:20 UTC + + * always check and perform the operation in the execution + + * max length check only if component is present. + + --------- + + Co-authored-by: mtg + Co-authored-by: GitHub + Co-authored-by: Christopher Henderson + +commit 526f9be2c26b63477a2d03d8a6a2736e2fe89b72 +Merge: b52111b 45e8dff +Author: mtgag +Date: Fri Jun 9 06:52:40 2023 +0200 + + Merge https://github.com/zmap/zlint + +commit 45e8dff6fe0d2a6989366a3dbd44713c360afc8f +Author: mwahaj +Date: Sun Jun 4 23:13:06 2023 +0500 + + Update README.md (#719) + + Added PKI Insights which also used zlint for X.509 Certificate verification against the PKI and Industry standards + + Co-authored-by: Christopher Henderson + +commit af903824a31385208566fa640cc13036a0e4d8e4 +Author: Christopher Henderson +Date: Sun Jun 4 11:02:45 2023 -0700 + + Enable accepting a PEM encoded CRL via the command line interface (#721) + + * dispatching CRLs to the CRL linting infra + + * fixing typo in README + +commit 1d8591cffbd9513c7302ef8187297e7463358291 +Author: toddgaunt-gs <107932811+toddgaunt-gs@users.noreply.github.com> +Date: Mon May 29 12:05:30 2023 -0400 + + Remove references in comments to Initialize() method of lints (#718) + + Some comments still refer to lints having an Initialize method. This + appears to no longer be the case but a warning in the comments for + RegisterLint, RegisterCertificateLint, and RegisterRevocationListLint + was still referencing lints having such a method. + +commit b52111baec7700cadeafd21ca74e448cec162483 +Merge: 351a379 2438596 +Author: mtgag +Date: Tue May 16 08:44:04 2023 +0200 + + Merge https://github.com/zmap/zlint + +commit 24385962110d84a33e403ae611169297e8d205c1 +Author: MTG <36234449+mtgag@users.noreply.github.com> +Date: Sun May 14 20:16:08 2023 +0200 + + Always perform e_cert_unique_identifier_version_not_2_or_3 (#711) + + * lint about the encoding of qcstatements for PSD2 + + * Revert "lint about the encoding of qcstatements for PSD2" + + This reverts commit 6c2367080d148f4b8c01f96a4c80e3ac55d1ef26. + + * util: gtld_map autopull updates for 2021-10-21T07:25:20 UTC + + * always check and perform the operation in the execution + + --------- + + Co-authored-by: mtg + Co-authored-by: GitHub + Co-authored-by: Christopher Henderson + +commit 351a37987e16c681f69725836a73dc888179d2be +Merge: 92e659c a5c869f +Author: Christopher Henderson +Date: Sun May 14 11:06:52 2023 -0700 + + Merge branch 'master' into master + +commit a5c869f807cbfce8a689aeba5682eb8f326845ea +Author: Christopher Henderson +Date: Sat May 13 09:23:45 2023 -0700 + + Update copyright text to 2023 (#716) + + * Updating copyright headers to 2023 + +commit 92e659c5aefeeea3afd8a32cc768b112a9355218 +Author: mtgag +Date: Thu Apr 27 08:55:54 2023 +0200 + + always check and perform the operation in the execution + +commit 30b096ee5b613af5eff751d9c5b878e8d07f529e +Merge: 8600050 997ad51 +Author: mtgag +Date: Wed Apr 19 08:41:37 2023 +0200 + + Merge https://github.com/zmap/zlint + +commit 997ad5143216f4a3f461545f277be7e20bdcb557 +Author: Amir Omidi +Date: Sun Mar 26 14:02:27 2023 -0400 + + Add CRL linting infrastructure (#699) + + * Add the skeleton around linting CRLs + + * Change the entrypoint of zlint + + * Add tests for the new skeleton + + * Address reviews + + * starting my own suggestions to work coopertaively on he change + + * Take out generics from the registration struct (#3) + + * Update to use Zcrypto instead of stdlib crypto for RevocationList (#4) + + * Take out generics from the registration struct (#3) + + * updating to use zcrypto + + * pointing zcrypto back to master + + * go tidy up + + --------- + + Co-authored-by: Amir Omidi + + * Tidy go mod + + * Update zcrypto + + * go mod tidy one more time + + * Bypass lint for Registry + + * Add NextUpdate CRL lint (#5) + + --------- + + Co-authored-by: christopher-henderson + +commit 64ae4e500e020b535a475a6c99007f77b917e1e9 +Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> +Date: Sun Mar 12 13:06:18 2023 -0700 + + build(deps): bump golang.org/x/net in /v3/cmd/genTestCerts (#704) + + Bumps [golang.org/x/net](https://github.com/golang/net) from 0.0.0-20220412020605-290c469a71a5 to 0.7.0. + - [Release notes](https://github.com/golang/net/releases) + - [Commits](https://github.com/golang/net/commits/v0.7.0) + + --- + updated-dependencies: + - dependency-name: golang.org/x/net + dependency-type: indirect + ... + + Signed-off-by: dependabot[bot] + Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> + Co-authored-by: Christopher Henderson + +commit 68901ea435cd9be1c5f37765ed178120c3f570f9 +Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> +Date: Sun Mar 12 12:58:25 2023 -0700 + + build(deps): bump golang.org/x/net in /v3 (#702) + + Bumps [golang.org/x/net](https://github.com/golang/net) from 0.0.0-20220412020605-290c469a71a5 to 0.7.0. + - [Release notes](https://github.com/golang/net/releases) + - [Commits](https://github.com/golang/net/commits/v0.7.0) + + --- + updated-dependencies: + - dependency-name: golang.org/x/net + dependency-type: direct:production + ... + + Signed-off-by: dependabot[bot] + Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> + Co-authored-by: Christopher Henderson + +commit 5ed8e34fe97edb3fedd7f1fb5cbc48a1444ea195 +Author: Christopher Henderson +Date: Sun Mar 12 12:48:34 2023 -0700 + + asserting human readable strings is error prone (#707) + +commit c7740fad1793b30df07212f9297066363efb19ce +Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> +Date: Sun Mar 12 12:32:52 2023 -0700 + + build(deps): bump golang.org/x/text in /v3/cmd/genTestCerts (#701) + + Bumps [golang.org/x/text](https://github.com/golang/text) from 0.3.7 to 0.3.8. + - [Release notes](https://github.com/golang/text/releases) + - [Commits](https://github.com/golang/text/compare/v0.3.7...v0.3.8) + + --- + updated-dependencies: + - dependency-name: golang.org/x/text + dependency-type: indirect + ... + + Signed-off-by: dependabot[bot] + Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> + Co-authored-by: Christopher Henderson + +commit a476724019152fa17e7ebb3c0bba6b896aecf89d +Author: Christopher Henderson +Date: Sun Mar 12 10:55:47 2023 -0700 + + Upgrading golangci-lint to v1.51.2 (#705) + +commit 46f7185e35ed0a7af55db60004a66ac4f15520fa +Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> +Date: Sun Mar 5 09:18:23 2023 -0800 + + build(deps): bump golang.org/x/text from 0.3.7 to 0.3.8 in /v3 (#700) + + Bumps [golang.org/x/text](https://github.com/golang/text) from 0.3.7 to 0.3.8. + - [Release notes](https://github.com/golang/text/releases) + - [Commits](https://github.com/golang/text/compare/v0.3.7...v0.3.8) + + --- + updated-dependencies: + - dependency-name: golang.org/x/text + dependency-type: direct:production + ... + + Signed-off-by: dependabot[bot] + Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> + +commit 8a9f61eb9d9b2ee4b14519573ee2f0d09474c316 +Author: Christopher Henderson +Date: Thu Nov 3 09:18:18 2022 -0700 + + test.ReadTestCert breaks for downstream consumers dependent on the previous relative certificate path building behavior (#695) + + * util: gtld_map autopull updates for 2022-10-06T19:22:06 UTC + + * Trigger GHA + + * revert change + + * fixing our own tests + + Co-authored-by: GitHub + +commit 6292ca4c07afed0c9e4f43470126901161fd0c2c +Author: Christopher Henderson +Date: Sun Oct 16 11:41:20 2022 -0700 + + Adding support for linting profiles (#595) + + * adding support for linting profiles + + * at least tests running + + * Update v3/lint/profile.go + + Absolutely + + Co-authored-by: Daniel McCarney + + * Update v3/newProfile.sh + + * adding godoc to AllProfiles + + * util: gtld_map autopull updates for 2022-10-06T19:22:06 UTC + + * Trigger GHA + + * fixing linter + + Co-authored-by: Daniel McCarney + Co-authored-by: GitHub + +commit c6273337f37bce57a42c61f61566465ba81a8f4d +Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> +Date: Sun Oct 16 10:20:03 2022 -0700 + + util: gtld_map autopull updates for 2022-10-10T19:22:35 UTC (#694) + + Co-authored-by: GitHub + +commit 13fcc6ff15096c615205e0073681d571227522f9 +Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> +Date: Sun Oct 9 07:06:19 2022 -0700 + + util: gtld_map autopull updates for 2022-10-06T19:22:06 UTC (#693) + + Co-authored-by: GitHub + +commit 137e46e0ca400af8c38465773a9d9ef8dc044b62 +Author: Christopher Henderson +Date: Sun Sep 18 11:18:06 2022 -0700 + + Lint to check for invalid KU lengths (#686) + + * lint for incorrecty KU length + + * better code comment + + * correcting linter + + * fixing lint to check for combinations with nine possible flags + + * fixing comments + + * using cryptobyte + + * accounting for jumbo sized KUs + +commit 1209017ea441820ff41f4ef6b05e946ed53efcda +Author: Rob <3725956+robplee@users.noreply.github.com> +Date: Sun Sep 18 19:08:44 2022 +0100 + + Prevent OU lint from applying to CA certificates. Add unit test to confirm change of behaviour (#691) + +commit 44e12c12ca43a4af86f0dc2da4a71493ac9f8345 +Author: Christopher Henderson +Date: Sun Aug 28 07:33:00 2022 -0700 + + Add lint to check for incorrect 'unused' bit encoding in KeyUsages (#684) + + * Add lint to check for incorrect 'unused' bit encoding + + * using real life test data as a failure case + +commit 3f5e40d69c7dd1ed2049051f00dba88e97794ef0 +Author: Christopher Henderson +Date: Sun Jul 31 11:02:44 2022 -0700 + + Lint for RSA close prime Fermat factorization susceptibility (#674) + + * lint for close prime factorization with a default round setting of 100 + +commit e5ee614b989dca0615c7fdb9cb6d621f281c5a20 +Author: Christopher Henderson +Date: Sat Jul 23 11:55:36 2022 -0700 + + Support for Configurable Lints (#648) + + * Support for configurable lints + +commit ed9a20f851f487d6d280b72dc9db232779fc11e3 +Author: Christopher Henderson +Date: Sun Jul 17 13:06:32 2022 -0700 + + Added lint to check for superfluous zero byte on KU (#682) + +commit d8b86f771ea068173826b2088f0c502c17eaaa8d +Author: MTG <36234449+mtgag@users.noreply.github.com> +Date: Sun Jun 19 19:58:35 2022 +0200 + + Lints for allowable key usages as per RFC 8813 Section 3 and RFC 3279 Section 2.3.1 (#678) + + * lint about the encoding of qcstatements for PSD2 + + * Revert "lint about the encoding of qcstatements for PSD2" + + This reverts commit 6c2367080d148f4b8c01f96a4c80e3ac55d1ef26. + + * util: gtld_map autopull updates for 2021-10-21T07:25:20 UTC + + * added lints that adress issues about correct key usage values for a certain public key type + + * adjustments in config.json + + * adjustments after code review + + * adjustments after code review + + * warnings are turned to errors + + * fixed error count + + Co-authored-by: mtg + Co-authored-by: GitHub + +commit c7955ed482857439faa68dfdfb67b94a1510bce1 +Author: MTG <36234449+mtgag@users.noreply.github.com> +Date: Mon Jun 13 16:19:30 2022 +0200 + + Sunset subject:organizationalUnitName (Section 7.1.4.2.2.i, CAB-Forum BR) (#643) + + * lint about the encoding of qcstatements for PSD2 + + * Revert "lint about the encoding of qcstatements for PSD2" + + This reverts commit 6c2367080d148f4b8c01f96a4c80e3ac55d1ef26. + + * util: gtld_map autopull updates for 2021-10-21T07:25:20 UTC + + * added lint for presence of OU in subject + + * Update v3/lints/cabf_br/lint_subject_contains_organizational_unit_name.go + + Co-authored-by: Ryan Sleevi + + * separated lints to adress two requirements + + * separated lints to adress two requirements + + * reverted change proposed by IDE + + * aligning to #644 + + * Update v3/util/time.go + + * Update v3/util/time.go + + * Update v3/util/time.go + + * addressed requested changes, removing lint that is implemented in 675 + + Co-authored-by: mtg + Co-authored-by: GitHub + Co-authored-by: Ryan Sleevi + Co-authored-by: Christopher Henderson From d4f2f9f20715c9d7f4c617254749917cce4834be Mon Sep 17 00:00:00 2001 From: mtgag Date: Wed, 30 Aug 2023 09:58:56 +0200 Subject: [PATCH 06/12] synchronised with project --- v3/integration/small.config.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/v3/integration/small.config.json b/v3/integration/small.config.json index f8b92f1dd..06a861a68 100644 --- a/v3/integration/small.config.json +++ b/v3/integration/small.config.json @@ -322,6 +322,12 @@ "e_rsa_allowed_ku_ee": { "ErrCount": 11 }, + "e_no_underscores_before_1_6_2": { + "ErrCount": 13 + }, + "e_incorrect_ku_encoding": { + "ErrCount": 239 + }, "n_ca_digital_signature_not_set": { "NoticeCount": 29 }, @@ -423,6 +429,9 @@ "w_subject_dn_trailing_whitespace": { "WarnCount": 4 }, - "w_tls_server_cert_valid_time_longer_than_397_days": {} + "w_tls_server_cert_valid_time_longer_than_397_days": {}, + "w_rfc_dnsname_underscore_in_trd": { + "WarnCount": 13 + } } } \ No newline at end of file From 24085437aa4e9a39b1f3ac86350774d68432055a Mon Sep 17 00:00:00 2001 From: mtgag Date: Thu, 14 Dec 2023 07:02:35 +0100 Subject: [PATCH 07/12] synchronised with project --- h | 531 -------------------------------------------------------------- 1 file changed, 531 deletions(-) delete mode 100644 h diff --git a/h b/h deleted file mode 100644 index 5d88c51e5..000000000 --- a/h +++ /dev/null @@ -1,531 +0,0 @@ -commit 92902fc7d9ae7ad9f221235c74b992be6f101812 (HEAD -> master, origin/master, origin/HEAD) -Merge: 526f9be 8c46bdf -Author: mtgag -Date: Sat Jul 1 09:28:04 2023 +0200 - - Merge https://github.com/zmap/zlint - -commit 8c46bdf0e6c8f3ccab7d3101cbf56eea9b7a856a -Author: Aaron Gable -Date: Fri Jun 30 12:56:49 2023 -0700 - - Fix typo in LintRevocationListEx comment (#730) - -commit 7ef1f8451ba9894bb27645321618de2bf9a158be -Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> -Date: Sun Jun 25 16:11:22 2023 -0700 - - util: gtld_map autopull updates for 2023-06-14T22:18:50 UTC (#727) - - Co-authored-by: GitHub - Co-authored-by: Christopher Henderson - -commit 5e0219d2a818f0d8c71f20191d79e010890c2269 -Author: MTG <36234449+mtgag@users.noreply.github.com> -Date: Mon Jun 26 01:02:29 2023 +0200 - - Bc critical (#722) - - * lint about the encoding of qcstatements for PSD2 - - * Revert "lint about the encoding of qcstatements for PSD2" - - This reverts commit 6c2367080d148f4b8c01f96a4c80e3ac55d1ef26. - - * util: gtld_map autopull updates for 2021-10-21T07:25:20 UTC - - * always check and perform the operation in the execution - - * returning fatal rather than na - - * Update v3/lints/rfc/lint_basic_constraints_not_critical.go - - Error instead of fatal - - Co-authored-by: Christopher Henderson - - * adding error description. - - --------- - - Co-authored-by: mtg - Co-authored-by: GitHub - Co-authored-by: Christopher Henderson - -commit 3746088f87cde72a751b8f8a68c9b0a9e9a6a8b0 -Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> -Date: Sun Jun 11 12:21:00 2023 -0700 - - util: gtld_map autopull updates for 2023-06-06T18:20:14 UTC (#698) - - Co-authored-by: GitHub - Co-authored-by: Zakir Durumeric - -commit 9b18bdcd8fedb5013bda10ba13de27e3bf4ed908 -Author: MTG <36234449+mtgag@users.noreply.github.com> -Date: Sun Jun 11 21:13:48 2023 +0200 - - Ca field empty description (#723) - - * lint about the encoding of qcstatements for PSD2 - - * Revert "lint about the encoding of qcstatements for PSD2" - - This reverts commit 6c2367080d148f4b8c01f96a4c80e3ac55d1ef26. - - * util: gtld_map autopull updates for 2021-10-21T07:25:20 UTC - - * always check and perform the operation in the execution - - * simply must not have a non-empty distinguished name should suffice. The field is always present, the lints tests if the Sequence is empty. - - --------- - - Co-authored-by: mtg - Co-authored-by: GitHub - Co-authored-by: Christopher Henderson - -commit 59a91a2b1b7562e80894103cf8f8e03319b82a92 -Author: MTG <36234449+mtgag@users.noreply.github.com> -Date: Sun Jun 11 21:02:42 2023 +0200 - - Max length check applies (#724) - - * lint about the encoding of qcstatements for PSD2 - - * Revert "lint about the encoding of qcstatements for PSD2" - - This reverts commit 6c2367080d148f4b8c01f96a4c80e3ac55d1ef26. - - * util: gtld_map autopull updates for 2021-10-21T07:25:20 UTC - - * always check and perform the operation in the execution - - * max length check only if component is present. - - --------- - - Co-authored-by: mtg - Co-authored-by: GitHub - Co-authored-by: Christopher Henderson - -commit 526f9be2c26b63477a2d03d8a6a2736e2fe89b72 -Merge: b52111b 45e8dff -Author: mtgag -Date: Fri Jun 9 06:52:40 2023 +0200 - - Merge https://github.com/zmap/zlint - -commit 45e8dff6fe0d2a6989366a3dbd44713c360afc8f -Author: mwahaj -Date: Sun Jun 4 23:13:06 2023 +0500 - - Update README.md (#719) - - Added PKI Insights which also used zlint for X.509 Certificate verification against the PKI and Industry standards - - Co-authored-by: Christopher Henderson - -commit af903824a31385208566fa640cc13036a0e4d8e4 -Author: Christopher Henderson -Date: Sun Jun 4 11:02:45 2023 -0700 - - Enable accepting a PEM encoded CRL via the command line interface (#721) - - * dispatching CRLs to the CRL linting infra - - * fixing typo in README - -commit 1d8591cffbd9513c7302ef8187297e7463358291 -Author: toddgaunt-gs <107932811+toddgaunt-gs@users.noreply.github.com> -Date: Mon May 29 12:05:30 2023 -0400 - - Remove references in comments to Initialize() method of lints (#718) - - Some comments still refer to lints having an Initialize method. This - appears to no longer be the case but a warning in the comments for - RegisterLint, RegisterCertificateLint, and RegisterRevocationListLint - was still referencing lints having such a method. - -commit b52111baec7700cadeafd21ca74e448cec162483 -Merge: 351a379 2438596 -Author: mtgag -Date: Tue May 16 08:44:04 2023 +0200 - - Merge https://github.com/zmap/zlint - -commit 24385962110d84a33e403ae611169297e8d205c1 -Author: MTG <36234449+mtgag@users.noreply.github.com> -Date: Sun May 14 20:16:08 2023 +0200 - - Always perform e_cert_unique_identifier_version_not_2_or_3 (#711) - - * lint about the encoding of qcstatements for PSD2 - - * Revert "lint about the encoding of qcstatements for PSD2" - - This reverts commit 6c2367080d148f4b8c01f96a4c80e3ac55d1ef26. - - * util: gtld_map autopull updates for 2021-10-21T07:25:20 UTC - - * always check and perform the operation in the execution - - --------- - - Co-authored-by: mtg - Co-authored-by: GitHub - Co-authored-by: Christopher Henderson - -commit 351a37987e16c681f69725836a73dc888179d2be -Merge: 92e659c a5c869f -Author: Christopher Henderson -Date: Sun May 14 11:06:52 2023 -0700 - - Merge branch 'master' into master - -commit a5c869f807cbfce8a689aeba5682eb8f326845ea -Author: Christopher Henderson -Date: Sat May 13 09:23:45 2023 -0700 - - Update copyright text to 2023 (#716) - - * Updating copyright headers to 2023 - -commit 92e659c5aefeeea3afd8a32cc768b112a9355218 -Author: mtgag -Date: Thu Apr 27 08:55:54 2023 +0200 - - always check and perform the operation in the execution - -commit 30b096ee5b613af5eff751d9c5b878e8d07f529e -Merge: 8600050 997ad51 -Author: mtgag -Date: Wed Apr 19 08:41:37 2023 +0200 - - Merge https://github.com/zmap/zlint - -commit 997ad5143216f4a3f461545f277be7e20bdcb557 -Author: Amir Omidi -Date: Sun Mar 26 14:02:27 2023 -0400 - - Add CRL linting infrastructure (#699) - - * Add the skeleton around linting CRLs - - * Change the entrypoint of zlint - - * Add tests for the new skeleton - - * Address reviews - - * starting my own suggestions to work coopertaively on he change - - * Take out generics from the registration struct (#3) - - * Update to use Zcrypto instead of stdlib crypto for RevocationList (#4) - - * Take out generics from the registration struct (#3) - - * updating to use zcrypto - - * pointing zcrypto back to master - - * go tidy up - - --------- - - Co-authored-by: Amir Omidi - - * Tidy go mod - - * Update zcrypto - - * go mod tidy one more time - - * Bypass lint for Registry - - * Add NextUpdate CRL lint (#5) - - --------- - - Co-authored-by: christopher-henderson - -commit 64ae4e500e020b535a475a6c99007f77b917e1e9 -Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> -Date: Sun Mar 12 13:06:18 2023 -0700 - - build(deps): bump golang.org/x/net in /v3/cmd/genTestCerts (#704) - - Bumps [golang.org/x/net](https://github.com/golang/net) from 0.0.0-20220412020605-290c469a71a5 to 0.7.0. - - [Release notes](https://github.com/golang/net/releases) - - [Commits](https://github.com/golang/net/commits/v0.7.0) - - --- - updated-dependencies: - - dependency-name: golang.org/x/net - dependency-type: indirect - ... - - Signed-off-by: dependabot[bot] - Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> - Co-authored-by: Christopher Henderson - -commit 68901ea435cd9be1c5f37765ed178120c3f570f9 -Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> -Date: Sun Mar 12 12:58:25 2023 -0700 - - build(deps): bump golang.org/x/net in /v3 (#702) - - Bumps [golang.org/x/net](https://github.com/golang/net) from 0.0.0-20220412020605-290c469a71a5 to 0.7.0. - - [Release notes](https://github.com/golang/net/releases) - - [Commits](https://github.com/golang/net/commits/v0.7.0) - - --- - updated-dependencies: - - dependency-name: golang.org/x/net - dependency-type: direct:production - ... - - Signed-off-by: dependabot[bot] - Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> - Co-authored-by: Christopher Henderson - -commit 5ed8e34fe97edb3fedd7f1fb5cbc48a1444ea195 -Author: Christopher Henderson -Date: Sun Mar 12 12:48:34 2023 -0700 - - asserting human readable strings is error prone (#707) - -commit c7740fad1793b30df07212f9297066363efb19ce -Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> -Date: Sun Mar 12 12:32:52 2023 -0700 - - build(deps): bump golang.org/x/text in /v3/cmd/genTestCerts (#701) - - Bumps [golang.org/x/text](https://github.com/golang/text) from 0.3.7 to 0.3.8. - - [Release notes](https://github.com/golang/text/releases) - - [Commits](https://github.com/golang/text/compare/v0.3.7...v0.3.8) - - --- - updated-dependencies: - - dependency-name: golang.org/x/text - dependency-type: indirect - ... - - Signed-off-by: dependabot[bot] - Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> - Co-authored-by: Christopher Henderson - -commit a476724019152fa17e7ebb3c0bba6b896aecf89d -Author: Christopher Henderson -Date: Sun Mar 12 10:55:47 2023 -0700 - - Upgrading golangci-lint to v1.51.2 (#705) - -commit 46f7185e35ed0a7af55db60004a66ac4f15520fa -Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> -Date: Sun Mar 5 09:18:23 2023 -0800 - - build(deps): bump golang.org/x/text from 0.3.7 to 0.3.8 in /v3 (#700) - - Bumps [golang.org/x/text](https://github.com/golang/text) from 0.3.7 to 0.3.8. - - [Release notes](https://github.com/golang/text/releases) - - [Commits](https://github.com/golang/text/compare/v0.3.7...v0.3.8) - - --- - updated-dependencies: - - dependency-name: golang.org/x/text - dependency-type: direct:production - ... - - Signed-off-by: dependabot[bot] - Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> - -commit 8a9f61eb9d9b2ee4b14519573ee2f0d09474c316 -Author: Christopher Henderson -Date: Thu Nov 3 09:18:18 2022 -0700 - - test.ReadTestCert breaks for downstream consumers dependent on the previous relative certificate path building behavior (#695) - - * util: gtld_map autopull updates for 2022-10-06T19:22:06 UTC - - * Trigger GHA - - * revert change - - * fixing our own tests - - Co-authored-by: GitHub - -commit 6292ca4c07afed0c9e4f43470126901161fd0c2c -Author: Christopher Henderson -Date: Sun Oct 16 11:41:20 2022 -0700 - - Adding support for linting profiles (#595) - - * adding support for linting profiles - - * at least tests running - - * Update v3/lint/profile.go - - Absolutely - - Co-authored-by: Daniel McCarney - - * Update v3/newProfile.sh - - * adding godoc to AllProfiles - - * util: gtld_map autopull updates for 2022-10-06T19:22:06 UTC - - * Trigger GHA - - * fixing linter - - Co-authored-by: Daniel McCarney - Co-authored-by: GitHub - -commit c6273337f37bce57a42c61f61566465ba81a8f4d -Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> -Date: Sun Oct 16 10:20:03 2022 -0700 - - util: gtld_map autopull updates for 2022-10-10T19:22:35 UTC (#694) - - Co-authored-by: GitHub - -commit 13fcc6ff15096c615205e0073681d571227522f9 -Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> -Date: Sun Oct 9 07:06:19 2022 -0700 - - util: gtld_map autopull updates for 2022-10-06T19:22:06 UTC (#693) - - Co-authored-by: GitHub - -commit 137e46e0ca400af8c38465773a9d9ef8dc044b62 -Author: Christopher Henderson -Date: Sun Sep 18 11:18:06 2022 -0700 - - Lint to check for invalid KU lengths (#686) - - * lint for incorrecty KU length - - * better code comment - - * correcting linter - - * fixing lint to check for combinations with nine possible flags - - * fixing comments - - * using cryptobyte - - * accounting for jumbo sized KUs - -commit 1209017ea441820ff41f4ef6b05e946ed53efcda -Author: Rob <3725956+robplee@users.noreply.github.com> -Date: Sun Sep 18 19:08:44 2022 +0100 - - Prevent OU lint from applying to CA certificates. Add unit test to confirm change of behaviour (#691) - -commit 44e12c12ca43a4af86f0dc2da4a71493ac9f8345 -Author: Christopher Henderson -Date: Sun Aug 28 07:33:00 2022 -0700 - - Add lint to check for incorrect 'unused' bit encoding in KeyUsages (#684) - - * Add lint to check for incorrect 'unused' bit encoding - - * using real life test data as a failure case - -commit 3f5e40d69c7dd1ed2049051f00dba88e97794ef0 -Author: Christopher Henderson -Date: Sun Jul 31 11:02:44 2022 -0700 - - Lint for RSA close prime Fermat factorization susceptibility (#674) - - * lint for close prime factorization with a default round setting of 100 - -commit e5ee614b989dca0615c7fdb9cb6d621f281c5a20 -Author: Christopher Henderson -Date: Sat Jul 23 11:55:36 2022 -0700 - - Support for Configurable Lints (#648) - - * Support for configurable lints - -commit ed9a20f851f487d6d280b72dc9db232779fc11e3 -Author: Christopher Henderson -Date: Sun Jul 17 13:06:32 2022 -0700 - - Added lint to check for superfluous zero byte on KU (#682) - -commit d8b86f771ea068173826b2088f0c502c17eaaa8d -Author: MTG <36234449+mtgag@users.noreply.github.com> -Date: Sun Jun 19 19:58:35 2022 +0200 - - Lints for allowable key usages as per RFC 8813 Section 3 and RFC 3279 Section 2.3.1 (#678) - - * lint about the encoding of qcstatements for PSD2 - - * Revert "lint about the encoding of qcstatements for PSD2" - - This reverts commit 6c2367080d148f4b8c01f96a4c80e3ac55d1ef26. - - * util: gtld_map autopull updates for 2021-10-21T07:25:20 UTC - - * added lints that adress issues about correct key usage values for a certain public key type - - * adjustments in config.json - - * adjustments after code review - - * adjustments after code review - - * warnings are turned to errors - - * fixed error count - - Co-authored-by: mtg - Co-authored-by: GitHub - -commit c7955ed482857439faa68dfdfb67b94a1510bce1 -Author: MTG <36234449+mtgag@users.noreply.github.com> -Date: Mon Jun 13 16:19:30 2022 +0200 - - Sunset subject:organizationalUnitName (Section 7.1.4.2.2.i, CAB-Forum BR) (#643) - - * lint about the encoding of qcstatements for PSD2 - - * Revert "lint about the encoding of qcstatements for PSD2" - - This reverts commit 6c2367080d148f4b8c01f96a4c80e3ac55d1ef26. - - * util: gtld_map autopull updates for 2021-10-21T07:25:20 UTC - - * added lint for presence of OU in subject - - * Update v3/lints/cabf_br/lint_subject_contains_organizational_unit_name.go - - Co-authored-by: Ryan Sleevi - - * separated lints to adress two requirements - - * separated lints to adress two requirements - - * reverted change proposed by IDE - - * aligning to #644 - - * Update v3/util/time.go - - * Update v3/util/time.go - - * Update v3/util/time.go - - * addressed requested changes, removing lint that is implemented in 675 - - Co-authored-by: mtg - Co-authored-by: GitHub - Co-authored-by: Ryan Sleevi - Co-authored-by: Christopher Henderson From e77fae15e50dcbfc6c214557cac40c94ddd465c1 Mon Sep 17 00:00:00 2001 From: mtgag Date: Wed, 24 Jan 2024 07:11:55 +0100 Subject: [PATCH 08/12] synchronised with project --- v3/go.sum | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/v3/go.sum b/v3/go.sum index babeff48b..31a34073f 100644 --- a/v3/go.sum +++ b/v3/go.sum @@ -65,6 +65,7 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -83,6 +84,7 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -90,6 +92,7 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -97,6 +100,7 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From 2c3b27a45ae3ac75c32679a9f444bc0962617c7a Mon Sep 17 00:00:00 2001 From: mtgag Date: Sun, 25 Feb 2024 12:13:01 +0100 Subject: [PATCH 09/12] added same lint for subject values instead of SAN values --- .../lint_single_email_subject_if_present.go | 62 +++++++++++++++++++ ...nt_single_email_subject_if_present_test.go | 40 ++++++++++++ .../smime/noEmailAddressInSubjectDN.pem | 41 ++++++++++++ .../smime/oneEmailAddressInSubjectDN.pem | 42 +++++++++++++ .../smime/twoEmailAddressesInSubjectDN.pem | 42 +++++++++++++ 5 files changed, 227 insertions(+) create mode 100644 v3/lints/cabf_smime_br/lint_single_email_subject_if_present.go create mode 100644 v3/lints/cabf_smime_br/lint_single_email_subject_if_present_test.go create mode 100644 v3/testdata/smime/noEmailAddressInSubjectDN.pem create mode 100644 v3/testdata/smime/oneEmailAddressInSubjectDN.pem create mode 100644 v3/testdata/smime/twoEmailAddressesInSubjectDN.pem diff --git a/v3/lints/cabf_smime_br/lint_single_email_subject_if_present.go b/v3/lints/cabf_smime_br/lint_single_email_subject_if_present.go new file mode 100644 index 000000000..427c2788e --- /dev/null +++ b/v3/lints/cabf_smime_br/lint_single_email_subject_if_present.go @@ -0,0 +1,62 @@ +/* + * ZLint Copyright 2024 Regents of the University of Michigan + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy + * of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package cabf_smime_br + +import ( + "fmt" + "net/mail" + + "github.com/zmap/zcrypto/x509" + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/util" +) + +func init() { + lint.RegisterCertificateLint(&lint.CertificateLint{ + LintMetadata: lint.LintMetadata{ + Name: "e_single_email_subject_if_present", + Description: "If present, the subject:emailAddress SHALL contain a single Mailbox Address", + Citation: "7.1.4.2.h", + Source: lint.CABFSMIMEBaselineRequirements, + EffectiveDate: util.CABF_SMIME_BRs_1_0_0_Date, + }, + Lint: func() lint.LintInterface { return &singleEmailSubjectIfPresent{} }, + }) +} + +type singleEmailSubjectIfPresent struct{} + +func NewSingleEmailSubjectIfPresent() lint.LintInterface { + return &singleEmailSubjectIfPresent{} +} + +func (l *singleEmailSubjectIfPresent) CheckApplies(c *x509.Certificate) bool { + return util.IsSubscriberCert(c) && c.Subject.EmailAddress != nil && util.IsSMIMEBRCertificate(c) +} + +func (l *singleEmailSubjectIfPresent) Execute(c *x509.Certificate) *lint.LintResult { + for _, email := range c.Subject.EmailAddress { + _, err := mail.ParseAddress(email) + if err != nil { + return &lint.LintResult{ + Status: lint.Error, + Details: fmt.Sprintf("subject:emailAddress was present and contained an invalid email address (%s)", email), + LintMetadata: lint.LintMetadata{}, + } + } + } + + return &lint.LintResult{Status: lint.Pass} +} diff --git a/v3/lints/cabf_smime_br/lint_single_email_subject_if_present_test.go b/v3/lints/cabf_smime_br/lint_single_email_subject_if_present_test.go new file mode 100644 index 000000000..954db0939 --- /dev/null +++ b/v3/lints/cabf_smime_br/lint_single_email_subject_if_present_test.go @@ -0,0 +1,40 @@ +package cabf_smime_br + +import ( + "testing" + + "github.com/zmap/zlint/v3/lint" + "github.com/zmap/zlint/v3/test" +) + +func TestSingleEmailSubjectIfPresent(t *testing.T) { + testCases := []struct { + Name string + InputFilename string + ExpectedResult lint.LintStatus + }{ + { + Name: "Error - email address present in subjectDN with multiple values", + InputFilename: "smime/twoEmailAddressesInSubjectDN.pem", + ExpectedResult: lint.Error, + }, + { + Name: "Error - email address present in subjectDN with one value", + InputFilename: "smime/oneEmailAddressInSubjectDN.pem", + ExpectedResult: lint.Pass, + }, + { + Name: "Error - no email address present in subjectDN", + InputFilename: "smime/noEmailAddressInSubjectDN.pem", + ExpectedResult: lint.NA, + }, + } + for _, tc := range testCases { + t.Run(tc.Name, func(t *testing.T) { + result := test.TestLint("e_single_email_subject_if_present", tc.InputFilename) + if result.Status != tc.ExpectedResult { + t.Errorf("expected result %v was %v - details: %v", tc.ExpectedResult, result.Status, result.Details) + } + }) + } +} diff --git a/v3/testdata/smime/noEmailAddressInSubjectDN.pem b/v3/testdata/smime/noEmailAddressInSubjectDN.pem new file mode 100644 index 000000000..58bbd4d26 --- /dev/null +++ b/v3/testdata/smime/noEmailAddressInSubjectDN.pem @@ -0,0 +1,41 @@ +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 42:17:33:09:8d:0d:17:ce:1e:5c:97:77 + Signature Algorithm: ecdsa-with-SHA256 + Issuer: CN = Lint CA, O = Lint, C = DE + Validity + Not Before: Sep 1 00:00:00 2023 GMT + Not After : Sep 1 00:00:00 2024 GMT + Subject: CN = SMIME, O = Lint, C = DE + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (256 bit) + pub: + 04:fc:9d:49:5c:28:e0:11:83:2e:f2:eb:91:54:31: + 24:b6:78:82:5f:ee:42:29:8e:c8:c3:c1:00:1c:66: + d7:51:96:5d:28:a2:fd:1e:dc:a2:97:e5:e9:ce:53: + 58:4b:fb:0a:46:df:42:ff:35:c8:8e:27:48:96:4e: + 46:4e:32:68:20 + ASN1 OID: prime256v1 + NIST CURVE: P-256 + X509v3 extensions: + X509v3 Certificate Policies: + Policy: 2.23.140.1.5.1.2 + + Signature Algorithm: ecdsa-with-SHA256 + 30:45:02:21:00:e7:47:dc:26:b3:2e:3b:fe:d7:af:a5:bc:63: + 94:ba:94:bd:38:7c:3c:ec:40:fa:38:39:29:ae:77:c0:3c:14: + 06:02:20:71:cf:42:af:f3:1b:b9:90:27:d2:bc:76:67:c0:00: + dd:59:54:61:95:b8:66:5f:c3:4e:99:6c:a2:58:0f:b6:e2 +-----BEGIN CERTIFICATE----- +MIIBbDCCARKgAwIBAgIMQhczCY0NF84eXJd3MAoGCCqGSM49BAMCMC4xEDAOBgNV +BAMMB0xpbnQgQ0ExDTALBgNVBAoMBExpbnQxCzAJBgNVBAYTAkRFMB4XDTIzMDkw +MTAwMDAwMFoXDTI0MDkwMTAwMDAwMFowLDEOMAwGA1UEAwwFU01JTUUxDTALBgNV +BAoMBExpbnQxCzAJBgNVBAYTAkRFMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE +/J1JXCjgEYMu8uuRVDEktniCX+5CKY7Iw8EAHGbXUZZdKKL9Htyil+XpzlNYS/sK +Rt9C/zXIjidIlk5GTjJoIKMYMBYwFAYDVR0gBA0wCzAJBgdngQwBBQECMAoGCCqG +SM49BAMCA0gAMEUCIQDnR9wmsy47/tevpbxjlLqUvTh8POxA+jg5Ka53wDwUBgIg +cc9Cr/MbuZAn0rx2Z8AA3VlUYZW4Zl/DTplsolgPtuI= +-----END CERTIFICATE----- diff --git a/v3/testdata/smime/oneEmailAddressInSubjectDN.pem b/v3/testdata/smime/oneEmailAddressInSubjectDN.pem new file mode 100644 index 000000000..9598a7c2a --- /dev/null +++ b/v3/testdata/smime/oneEmailAddressInSubjectDN.pem @@ -0,0 +1,42 @@ +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 89:20:fd:0d:4f:59:a1:79:ff:86:e5:26 + Signature Algorithm: ecdsa-with-SHA256 + Issuer: CN = Lint CA, O = Lint, C = DE + Validity + Not Before: Sep 1 00:00:00 2023 GMT + Not After : Sep 1 00:00:00 2024 GMT + Subject: emailAddress = zlint@example.com, O = Lint, C = DE + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (256 bit) + pub: + 04:91:d8:6e:7f:71:94:58:a1:2d:2b:fd:0c:e2:51: + 1a:69:a5:2b:43:46:3d:1e:0c:e4:21:d4:29:a6:c3: + 9a:c5:07:df:9d:9a:81:05:04:92:43:45:4b:46:e3: + 24:e5:ba:5e:a6:70:a1:8e:b1:f8:d6:f4:be:d1:46: + b5:91:af:50:61 + ASN1 OID: prime256v1 + NIST CURVE: P-256 + X509v3 extensions: + X509v3 Certificate Policies: + Policy: 2.23.140.1.5.1.2 + + Signature Algorithm: ecdsa-with-SHA256 + 30:46:02:21:00:f3:c0:3b:a7:6e:c2:e9:a7:31:c5:8c:ef:7c: + c5:3e:73:56:27:e4:af:dd:fe:5c:42:68:de:b8:e1:0a:b3:98: + 46:02:21:00:84:56:5e:50:93:17:17:8c:86:3c:93:56:8f:79: + 03:5e:53:01:f3:c9:4d:d2:4b:ea:6f:46:7b:ac:32:0d:c6:ad +-----BEGIN CERTIFICATE----- +MIIBgDCCASWgAwIBAgINAIkg/Q1PWaF5/4blJjAKBggqhkjOPQQDAjAuMRAwDgYD +VQQDDAdMaW50IENBMQ0wCwYDVQQKDARMaW50MQswCQYDVQQGEwJERTAeFw0yMzA5 +MDEwMDAwMDBaFw0yNDA5MDEwMDAwMDBaMD4xIDAeBgkqhkiG9w0BCQEWEXpsaW50 +QGV4YW1wbGUuY29tMQ0wCwYDVQQKDARMaW50MQswCQYDVQQGEwJERTBZMBMGByqG +SM49AgEGCCqGSM49AwEHA0IABJHYbn9xlFihLSv9DOJRGmmlK0NGPR4M5CHUKabD +msUH352agQUEkkNFS0bjJOW6XqZwoY6x+Nb0vtFGtZGvUGGjGDAWMBQGA1UdIAQN +MAswCQYHZ4EMAQUBAjAKBggqhkjOPQQDAgNJADBGAiEA88A7p27C6acxxYzvfMU+ +c1Yn5K/d/lxCaN644QqzmEYCIQCEVl5QkxcXjIY8k1aPeQNeUwHzyU3SS+pvRnus +Mg3GrQ== +-----END CERTIFICATE----- diff --git a/v3/testdata/smime/twoEmailAddressesInSubjectDN.pem b/v3/testdata/smime/twoEmailAddressesInSubjectDN.pem new file mode 100644 index 000000000..6560a6af7 --- /dev/null +++ b/v3/testdata/smime/twoEmailAddressesInSubjectDN.pem @@ -0,0 +1,42 @@ +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 11:58:a9:ab:65:63:46:e7:02:8f:b3:eb + Signature Algorithm: ecdsa-with-SHA256 + Issuer: CN = Lint CA, O = Lint, C = DE + Validity + Not Before: Sep 1 00:00:00 2023 GMT + Not After : Sep 1 00:00:00 2024 GMT + Subject: emailAddress = zlint@example.com second@example.com, O = Lint, C = DE + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (256 bit) + pub: + 04:91:ee:42:50:c4:da:48:da:63:04:bd:e0:30:54: + 3e:65:b7:c8:17:1a:c1:38:4d:f4:a6:91:3b:03:0c: + d2:36:cf:f1:72:d9:b3:4c:d4:39:9e:a4:d0:b5:27: + d2:50:74:9f:80:b2:ac:d2:fa:af:ed:bd:de:8b:3e: + 52:d7:08:77:a2 + ASN1 OID: prime256v1 + NIST CURVE: P-256 + X509v3 extensions: + X509v3 Certificate Policies: + Policy: 2.23.140.1.5.1.2 + + Signature Algorithm: ecdsa-with-SHA256 + 30:46:02:21:00:98:5f:ff:ba:1f:32:88:63:1f:cd:6d:f9:fb: + 81:82:48:c1:d9:2d:fb:84:5b:6e:6d:74:87:7f:61:ca:a3:a5: + a7:02:21:00:c8:f2:5b:c7:96:1c:3c:67:b5:4d:eb:27:4d:71: + fa:86:6b:c0:c4:a8:fd:d1:8e:dc:3b:17:f9:1f:ca:3c:ff:f3 +-----BEGIN CERTIFICATE----- +MIIBkjCCATegAwIBAgIMEVipq2VjRucCj7PrMAoGCCqGSM49BAMCMC4xEDAOBgNV +BAMMB0xpbnQgQ0ExDTALBgNVBAoMBExpbnQxCzAJBgNVBAYTAkRFMB4XDTIzMDkw +MTAwMDAwMFoXDTI0MDkwMTAwMDAwMFowUTEzMDEGCSqGSIb3DQEJARYkemxpbnRA +ZXhhbXBsZS5jb20gc2Vjb25kQGV4YW1wbGUuY29tMQ0wCwYDVQQKDARMaW50MQsw +CQYDVQQGEwJERTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJHuQlDE2kjaYwS9 +4DBUPmW3yBcawThN9KaROwMM0jbP8XLZs0zUOZ6k0LUn0lB0n4CyrNL6r+293os+ +UtcId6KjGDAWMBQGA1UdIAQNMAswCQYHZ4EMAQUBAjAKBggqhkjOPQQDAgNJADBG +AiEAmF//uh8yiGMfzW35+4GCSMHZLfuEW25tdId/YcqjpacCIQDI8lvHlhw8Z7VN +6ydNcfqGa8DEqP3Rjtw7F/kfyjz/8w== +-----END CERTIFICATE----- From ccfd13d6721c56bec9ce0940f3ecaf8efd9d02f6 Mon Sep 17 00:00:00 2001 From: mtgag Date: Sun, 25 Feb 2024 14:43:28 +0100 Subject: [PATCH 10/12] resolved conflict issue --- v3/integration/small.config.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/v3/integration/small.config.json b/v3/integration/small.config.json index 73785fd40..621242602 100644 --- a/v3/integration/small.config.json +++ b/v3/integration/small.config.json @@ -430,12 +430,9 @@ "w_tls_server_cert_valid_time_longer_than_397_days": {}, "w_rfc_dnsname_underscore_in_trd": { "WarnCount": 13 -<<<<<<< HEAD -======= }, "w_sub_cert_aia_contains_internal_names": { "WarnCount": 7 ->>>>>>> 45de88040a22e2db4d962de9ec3847dcac59be92 } } } \ No newline at end of file From 632fda501059cdac0eac908c02ab1d6e3de19d7b Mon Sep 17 00:00:00 2001 From: mtgag Date: Thu, 29 Feb 2024 09:55:39 +0100 Subject: [PATCH 11/12] addressed review comments and hint to citation from #795 --- .../lint_single_email_subject_if_present.go | 16 +++++++--------- .../lint_single_email_subject_if_present_test.go | 6 +++--- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/v3/lints/cabf_smime_br/lint_single_email_subject_if_present.go b/v3/lints/cabf_smime_br/lint_single_email_subject_if_present.go index 427c2788e..1958a95d5 100644 --- a/v3/lints/cabf_smime_br/lint_single_email_subject_if_present.go +++ b/v3/lints/cabf_smime_br/lint_single_email_subject_if_present.go @@ -28,11 +28,11 @@ func init() { LintMetadata: lint.LintMetadata{ Name: "e_single_email_subject_if_present", Description: "If present, the subject:emailAddress SHALL contain a single Mailbox Address", - Citation: "7.1.4.2.h", + Citation: "7.1.4.2.2.h", Source: lint.CABFSMIMEBaselineRequirements, EffectiveDate: util.CABF_SMIME_BRs_1_0_0_Date, }, - Lint: func() lint.LintInterface { return &singleEmailSubjectIfPresent{} }, + Lint: NewSingleEmailSubjectIfPresent, }) } @@ -43,20 +43,18 @@ func NewSingleEmailSubjectIfPresent() lint.LintInterface { } func (l *singleEmailSubjectIfPresent) CheckApplies(c *x509.Certificate) bool { - return util.IsSubscriberCert(c) && c.Subject.EmailAddress != nil && util.IsSMIMEBRCertificate(c) + emailAddress := c.Subject.EmailAddress + return util.IsSubscriberCert(c) && emailAddress != nil && len(emailAddress) != 0 && util.IsSMIMEBRCertificate(c) } func (l *singleEmailSubjectIfPresent) Execute(c *x509.Certificate) *lint.LintResult { for _, email := range c.Subject.EmailAddress { - _, err := mail.ParseAddress(email) - if err != nil { + if _, err := mail.ParseAddress(email); err != nil { return &lint.LintResult{ - Status: lint.Error, - Details: fmt.Sprintf("subject:emailAddress was present and contained an invalid email address (%s)", email), - LintMetadata: lint.LintMetadata{}, + Status: lint.Error, + Details: fmt.Sprintf("subject:emailAddress was present and contained an invalid email address (%s)", email), } } } - return &lint.LintResult{Status: lint.Pass} } diff --git a/v3/lints/cabf_smime_br/lint_single_email_subject_if_present_test.go b/v3/lints/cabf_smime_br/lint_single_email_subject_if_present_test.go index 954db0939..7e64ad9f1 100644 --- a/v3/lints/cabf_smime_br/lint_single_email_subject_if_present_test.go +++ b/v3/lints/cabf_smime_br/lint_single_email_subject_if_present_test.go @@ -14,17 +14,17 @@ func TestSingleEmailSubjectIfPresent(t *testing.T) { ExpectedResult lint.LintStatus }{ { - Name: "Error - email address present in subjectDN with multiple values", + Name: "error - email address present in subjectDN with multiple values", InputFilename: "smime/twoEmailAddressesInSubjectDN.pem", ExpectedResult: lint.Error, }, { - Name: "Error - email address present in subjectDN with one value", + Name: "pass - email address present in subjectDN with one value", InputFilename: "smime/oneEmailAddressInSubjectDN.pem", ExpectedResult: lint.Pass, }, { - Name: "Error - no email address present in subjectDN", + Name: "na - no email address present in subjectDN", InputFilename: "smime/noEmailAddressInSubjectDN.pem", ExpectedResult: lint.NA, }, From dd340e51eebb50af9b1b4752b379f561045634fe Mon Sep 17 00:00:00 2001 From: mtgag Date: Fri, 1 Mar 2024 09:10:37 +0100 Subject: [PATCH 12/12] addressing issue #795 and review comments of PR #802 --- .../lint_single_email_if_present.go | 39 ++++++++++++------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/v3/lints/cabf_smime_br/lint_single_email_if_present.go b/v3/lints/cabf_smime_br/lint_single_email_if_present.go index a5373ec9d..d9731d559 100644 --- a/v3/lints/cabf_smime_br/lint_single_email_if_present.go +++ b/v3/lints/cabf_smime_br/lint_single_email_if_present.go @@ -23,16 +23,33 @@ import ( "github.com/zmap/zlint/v3/util" ) +/************************************************************************* +7.1.4.2.1 Subject alternative name extension + +All Mailbox Addresses in the subject field or entries of type dirName of this extension SHALL be +repeated as rfc822Name or otherName values of type id-on-SmtpUTF8Mailbox in this +extension. + +7.1.4.2.2 Subject distinguished name fields + +h. Certificate Field: subject:emailAddress (1.2.840.113549.1.9.1) Contents: If present, the +subject:emailAddress SHALL contain a single Mailbox Address as verified under +Section 3.2.2. + +Combining these requirements, this lint checks for malformed email addresses in SAN entries +covering the case of a non-single Mailbox Address. +*************************************************************************/ + func init() { lint.RegisterCertificateLint(&lint.CertificateLint{ LintMetadata: lint.LintMetadata{ Name: "e_single_email_if_present", - Description: "If present, the subject:emailAddress SHALL contain a single Mailbox Address", - Citation: "7.1.4.2.h", + Description: "If present, the subject:emailAddress SHALL contain a single Mailbox Address. All Mailbox Addresses in the subject field SHALL be repeated as rfc822Name or otherName values of type id-on-SmtpUTF8Mailbox in SAN extension.", + Citation: "7.1.4.2.1 and 7.1.4.2.2.h", Source: lint.CABFSMIMEBaselineRequirements, EffectiveDate: util.CABF_SMIME_BRs_1_0_0_Date, }, - Lint: func() lint.LintInterface { return &singleEmailIfPresent{} }, + Lint: NewSingleEmailIfPresent, }) } @@ -43,22 +60,18 @@ func NewSingleEmailIfPresent() lint.LintInterface { } func (l *singleEmailIfPresent) CheckApplies(c *x509.Certificate) bool { - return util.IsSubscriberCert(c) && c.EmailAddresses != nil && len(c.EmailAddresses) != 0 && util.IsSMIMEBRCertificate(c) + addresses := c.EmailAddresses + return util.IsSubscriberCert(c) && addresses != nil && len(addresses) != 0 && util.IsSMIMEBRCertificate(c) } func (l *singleEmailIfPresent) Execute(c *x509.Certificate) *lint.LintResult { for _, email := range c.EmailAddresses { - _, err := mail.ParseAddress(email) - if err != nil { + if _, err := mail.ParseAddress(email); err != nil { return &lint.LintResult{ - Status: lint.Error, - Details: fmt.Sprintf("subject:emailAddress was present and contained an invalid email address (%s)", email), - LintMetadata: lint.LintMetadata{}, + Status: lint.Error, + Details: fmt.Sprintf("san:emailAddress was present and contained an invalid email address (%s)", email), } } } - - return &lint.LintResult{ - Status: lint.Pass, - } + return &lint.LintResult{Status: lint.Pass} }