Fix various x509 path validation bugs + path building with ambiguous DNs

Signed-off-by: Fabian Weissberg <[email protected]>

4 files changed, 158 insertions, 159 deletions

diff --git a/src/tests/data/x509/pss_certs/03/end.crt b/src/tests/data/x509/pss_certs/03/end.crt
index f6298057d..f726924f0 100644
--- a/src/tests/data/x509/pss_certs/03/end.crt
+++ b/src/tests/data/x509/pss_certs/03/end.crt
@@ -1,53 +1,53 @@
------BEGIN CERTIFICATE-----
-MIIErDCCA2CgAwIBAgIGAVyhUN7SMEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUD
-BAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIDBoMQ8wDQYD
-VQQDDAZQU1MtQ0ExFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3Rh
-bjEPMA0GA1UEBwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxEDAOBgNVBAYTB0dlcm1h
-bnkwIBcNOTkxMjMxMjMwMDAwWhgPMjA5OTEyMzEyMzAwMDBaMGoxETAPBgNVBAMM
-CFBTUy1DZXJ0MRQwEgYDVQQLDAtCb3Rhbi1UZXN0czEOMAwGA1UECgwFQm90YW4x
-DzANBgNVBAcMBkJvY2h1bTEMMAoGA1UECAwDTlJXMRAwDgYDVQQGEwdHZXJtYW55
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAodW01rU/fvHj0hzb/BbR
-uB+XW+Hu63eVygItU8qP7XJc4DSMW+uCy8BAMQ1/V+fAiKC343tTooGItmXcGrq5
-UcR9OROv5iyb5JVnwOx6Q0AZKM92ySBMuysh2TQwhuOMfPylwTC5ufOrk+Lt7KgJ
-PKPe8MTFkG5OUOhwZudcYTijE6FFSMJ0AfSlQw/BsIG1Vs55dOrsqHjHtrmpehnm
-NeET39j7nm6QZjJ2tVZr++rpy2mz5FJ7aiIxwER7Zy6QNojvAUiOj0A9LlTwZGZS
-fc3mfST4HJfiriI5zC4RrwtdJ/xwgLS5Z3Mr67afguVkAsPk7mb8q2FkqKn79M4T
-dQIDAQABo4HvMIHsMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMIGXBgNV
-HSMEgY8wgYyAFHnlihwNezCz/0+QfDeNJjPHHUlOoWykajBoMQ8wDQYDVQQDDAZQ
-U1MtQ0ExFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3RhbjEPMA0G
-A1UEBwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxEDAOBgNVBAYTB0dlcm1hbnmCBgFc
-oKxc1DATBgNVHREEDDAKgghQU1MtQ2VydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwQQYJKoZIhvcNAQEKMDSgDzANBglghkgBZQMEAgEFAKEcMBoGCSqG
-SIb3DQEBCDANBglghkgBZQMEAgEFAKIDAgEgA4IBAQCGxhXlQLdsOi/fPED9RG4h
-0W2S6zNiAlOnCnwgw/Jo9JoPEEknKKohIc5RfRdB5oPijiVBBtBnxQIfCaPSULf4
-KDVLC8wNLFb8N1VB0N/A7Uju6+5AHMu5Yq4ka5RFxTvB1zXfCnxkezma5EHsuGBM
-nKJ6AnlvhpoPjNOgizKr06/qUoeLWPbDl2rFdtEoTjW/dpct2jBGZ3KWIcyJcW0o
-+Nunz+HlQc5Wjvpz2SqiF1B+m3ffv1Ehgrrk8nKe3KbGpxT2A40fWDGDJfsGssSH
-7y1ZSXQlofDnFMBo1k9nHlzK7+5rpBYX9rnfev9p7VghDx9KuHa6WyU7MC97r+N9
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIEeTCCAy2gAwIBAgIGAVygrFzUMEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUD
-BAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIDBoMQ8wDQYD
-VQQDDAZQU1MtQ0ExFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3Rh
-bjEPMA0GA1UEBwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxEDAOBgNVBAYTB0dlcm1h
-bnkwIBcNOTkxMjMxMjMwMDAwWhgPMjA5OTEyMzEyMzAwMDBaMGgxDzANBgNVBAMM
-BlBTUy1DQTEUMBIGA1UECwwLQm90YW4tVGVzdHMxDjAMBgNVBAoMBUJvdGFuMQ8w
-DQYDVQQHDAZCb2NodW0xDDAKBgNVBAgMA05SVzEQMA4GA1UEBhMHR2VybWFueTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZpazi/xuB2EDdsNCln3XAz
-njxyuwsGetZ4PK9OfEoxaDznFIv8Ll/MV2nO8tG5BiUzxw1KbfOFJOFKFaT1r7Y6
-/ipzOEAN+0ixx8c2PQWTs5oc1k4yJmhf8UpWHmqfyH4dXNqgJG2n3+3m8pK4D/G2
-ciE+fPaSHpJF1I0lQ+g+zKHoq2J1HR0KOz6hQBMSOxNe557GGecgKPwsnI7cJMFS
-CRUtA3njIhxcPNMix332NLz6Hi3H5TxPA+o3Y/Demfs/quauM3hb7M/DyLZ9k3no
-IUsQiSCZC8JyUkHTJAoRlL5FHPWP4CkKQ7CBF8evaiVm/RBZfI2CZ1ygTXaNOW8C
-AwEAAaOBvjCBuzAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zCBlwYD
-VR0jBIGPMIGMgBR55YocDXsws/9PkHw3jSYzxx1JTqFspGowaDEPMA0GA1UEAwwG
-UFNTLUNBMRQwEgYDVQQLDAtCb3Rhbi1UZXN0czEOMAwGA1UECgwFQm90YW4xDzAN
-BgNVBAcMBkJvY2h1bTEMMAoGA1UECAwDTlJXMRAwDgYDVQQGEwdHZXJtYW55ggYB
-XKCsXNQwQQYJKoZIhvcNAQEKMDSgDzANBglghkgBZQMEAgEFAKEcMBoGCSqGSIb3
-DQEBCDANBglghkgBZQMEAgEFAKIDAgEgA4IBAQAtcKFeatctcgDoJdx5nPK5JLrp
-cQL09M1DEDvmw+qlo9z9hUI60cD8r351jMQ2aMV+ba0NT/El2P7WWumRpW+7gkAu
-uUwlnybtBTF7J2aDoA/M+vN6AkuWlJUc3A5TnsKQE1KkLmENp8ofD8UgUZjlQP8H
-JBQ7YnPzdpCdh1yI1uOn6rxYkFq5BR+Wqj6wI9oYMTPSiZFhTnC1zYC1wJuJRR70
-imkMHZsJ3Ov4vMCBfnkf7ONte/HUcc14VW8q/vmiGONfER/JXm1D+bJHwZGBerHC
-4s369aikQMYGi3mav6GIUQOPrnPCQpOmocl0QsG/QTcKJot1K4kDR3uwAsOy
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----

+MIIEnTCCA1GgAwIBAgIGAWAB9W4PMEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUD

+BAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIDBjMQ8wDQYD

+VQQDDAZQU1MtQ0ExFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3Rh

+bjEPMA0GA1UEBwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxCzAJBgNVBAYTAkRFMCAX

+DTAwMTIzMTIzMDAwMFoYDzIwOTgxMjMxMjMwMDAwWjBlMREwDwYDVQQDDAhQU1Mt

+Q2VydDEUMBIGA1UECwwLQm90YW4tVGVzdHMxDjAMBgNVBAoMBUJvdGFuMQ8wDQYD

+VQQHDAZCb2NodW0xDDAKBgNVBAgMA05SVzELMAkGA1UEBhMCREUwggEiMA0GCSqG

+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxW+LMi18HK+SRoKI3m2d3sMnI0GH5UbaI

+q3l5RdxFD0iUdiBVI6trbxPcDSNVovPOs2Y5C0tO1Wh6E9weU4Qck/oB3hn0XI9y

+cyWzgdj/tTfE4/2P96Mo5jRi1AsM3GXGsKmuKULCYItjuGeEbz31tMmaOCQ8o41a

+8eQrYljFWgWkEMUa1AmjoTTzR5WjkuHUtpUFvSjFk7+ZNRFv+WxvZ8KB9Zdb/HDJ

+XIKdOL5CuL+3iSQn0yZM3iU5kTxkTjCC8jcCNTe3s/VsAX/ij5+jmU8ln/sAqOGC

+lGmIlZcYi7ojw53Wvvw8duNFZPyK1PoI5UVINeK2uSW2vt33Ot9fAgMBAAGjgeow

+gecwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwgZIGA1UdIwSBijCBh4AU

+NvWUOAnGk/vcVjyy75iIFkmxn1yhZ6RlMGMxDzANBgNVBAMMBlBTUy1DQTEUMBIG

+A1UECwwLQm90YW4tVGVzdHMxDjAMBgNVBAoMBUJvdGFuMQ8wDQYDVQQHDAZCb2No

+dW0xDDAKBgNVBAgMA05SVzELMAkGA1UEBhMCREWCBgFgAfJIKTATBgNVHREEDDAK

+gghQU1MtQ2VydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwQQYJKoZI

+hvcNAQEKMDSgDzANBglghkgBZQMEAgEFAKEcMBoGCSqGSIb3DQEBCDANBglghkgB

+ZQMEAgEFAKIDAgEgA4IBAQAIvskMuvUUlpCj6aAg1p8+CuMPWTyfjayqiJ+8IDIp

+up51n4H5IpAhnp4MsXQ3oySsXSe7RmgkOFTrei8U2B9v+nf2ebCOjEl//cgEHMqC

+pVAJUcaiG/TL2RhZjzAXebk7R4Wia1ZXKiMLvFk84aVbSFfdb1S+RnwqpAMC+VAy

+Qb3GzShRSDUkk1TiuujBdKa/mnv2Qs2OBHcjD6elXVnp+bYbsvET1uizRaQ8yEOD

+DnZhzEGxWsZKsnsApJt/iEZnK5bdLeS7FCp15BgPlphNjvFV6lO75Tv4x1JGsHZl

+FFYJzCWCZd1Egp5c5zMAC/PRjRUQ04sAmynOHEs0jp2T

+-----END CERTIFICATE-----

+-----BEGIN CERTIFICATE-----

+MIIEajCCAx6gAwIBAgIGAWAB8kgpMEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUD

+BAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIDBjMQ8wDQYD

+VQQDDAZQU1MtQ0ExFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3Rh

+bjEPMA0GA1UEBwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxCzAJBgNVBAYTAkRFMCAX

+DTk5MTIzMTIzMDAwMFoYDzIwOTkxMjMxMjMwMDAwWjBjMQ8wDQYDVQQDDAZQU1Mt

+Q0ExFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3RhbjEPMA0GA1UE

+BwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxCzAJBgNVBAYTAkRFMIIBIjANBgkqhkiG

+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg6QT4bJpuTGy2+eG1h4O22XQwCWz2wAmerQd

+xK1oFeXzfOUR0cnpGBDvhIzprK7Ino0SKuV9WBDCw8wQakx45Y1YNoQJ7Y816B1d

+cu2IsRX5T+CwAC5awJIMOYKN+izb7ad5ZvOBKZbr0I0kTut7ZtKJS67IUH/RqxXY

+KsOLOkTtpiTKGMLMUPOjFgbhVxzn8z9p8zgwNbrSXlUVazsov3JfB6xVQRu6wNSw

+i1K9c3NmJPD+jN+F2Ga1Y1bhEI2GJUBsulg5nfJ9y+p5Xez8OsqM3vMZ9ukhl0l9

+UwHxebwzRKL/yad3iXiPAV7a2tluZs2WgnlHlTTMSVBDTgzVgQIDAQABo4G5MIG2

+MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MIGSBgNVHSMEgYowgYeA

+FDb1lDgJxpP73FY8su+YiBZJsZ9coWekZTBjMQ8wDQYDVQQDDAZQU1MtQ0ExFDAS

+BgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3RhbjEPMA0GA1UEBwwGQm9j

+aHVtMQwwCgYDVQQIDANOUlcxCzAJBgNVBAYTAkRFggYBYAHySCkwQQYJKoZIhvcN

+AQEKMDSgDzANBglghkgBZQMEAgEFAKEcMBoGCSqGSIb3DQEBCDANBglghkgBZQME

+AgEFAKIDAgEgA4IBAQAj45MXBTbkT7M07h+EFBnjCTZ7SriCw3nhZAjSqK35EjGH

+l66YRr/oaqgyWaL67TBDNG0yUtW42chOXmbvgwryvKganUjJsOmaYqOng1V4C6N2

+2ld+pMvQSLG1q6O1lfJLKRMKfbEuwoza8CiBXqzrKFA1LIc8RgWQ83pyGSsdK6yq

+fpExGBDk8tZI5pVLiSfINcqStr+tSt8egrkD4O437li0paALfL719jVjH3vL6L+T

+dZ89ty1Pv30bvipPe0SUGtiUiNEvdR+ia8WJtjKq18mKwklPH/DmhS5IuNawwoo5

+XXNV7igmlyKvO+yoa67HNw1w0d4tRCEQJnM38zuV

+-----END CERTIFICATE-----

diff --git a/src/tests/data/x509/pss_certs/03/root.crt b/src/tests/data/x509/pss_certs/03/root.crt
index deb03ade9..253e616bf 100644
--- a/src/tests/data/x509/pss_certs/03/root.crt
+++ b/src/tests/data/x509/pss_certs/03/root.crt
@@ -1,26 +1,26 @@
------BEGIN CERTIFICATE-----
-MIIEeTCCAy2gAwIBAgIGAVygrFzUMEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUD
-BAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIDBoMQ8wDQYD
-VQQDDAZQU1MtQ0ExFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3Rh
-bjEPMA0GA1UEBwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxEDAOBgNVBAYTB0dlcm1h
-bnkwIBcNOTkxMjMxMjMwMDAwWhgPMjA5OTEyMzEyMzAwMDBaMGgxDzANBgNVBAMM
-BlBTUy1DQTEUMBIGA1UECwwLQm90YW4tVGVzdHMxDjAMBgNVBAoMBUJvdGFuMQ8w
-DQYDVQQHDAZCb2NodW0xDDAKBgNVBAgMA05SVzEQMA4GA1UEBhMHR2VybWFueTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZpazi/xuB2EDdsNCln3XAz
-njxyuwsGetZ4PK9OfEoxaDznFIv8Ll/MV2nO8tG5BiUzxw1KbfOFJOFKFaT1r7Y6
-/ipzOEAN+0ixx8c2PQWTs5oc1k4yJmhf8UpWHmqfyH4dXNqgJG2n3+3m8pK4D/G2
-ciE+fPaSHpJF1I0lQ+g+zKHoq2J1HR0KOz6hQBMSOxNe557GGecgKPwsnI7cJMFS
-CRUtA3njIhxcPNMix332NLz6Hi3H5TxPA+o3Y/Demfs/quauM3hb7M/DyLZ9k3no
-IUsQiSCZC8JyUkHTJAoRlL5FHPWP4CkKQ7CBF8evaiVm/RBZfI2CZ1ygTXaNOW8C
-AwEAAaOBvjCBuzAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zCBlwYD
-VR0jBIGPMIGMgBR55YocDXsws/9PkHw3jSYzxx1JTqFspGowaDEPMA0GA1UEAwwG
-UFNTLUNBMRQwEgYDVQQLDAtCb3Rhbi1UZXN0czEOMAwGA1UECgwFQm90YW4xDzAN
-BgNVBAcMBkJvY2h1bTEMMAoGA1UECAwDTlJXMRAwDgYDVQQGEwdHZXJtYW55ggYB
-XKCsXNQwQQYJKoZIhvcNAQEKMDSgDzANBglghkgBZQMEAgEFAKEcMBoGCSqGSIb3
-DQEBCDANBglghkgBZQMEAgEFAKIDAgEgA4IBAQAtcKFeatctcgDoJdx5nPK5JLrp
-cQL09M1DEDvmw+qlo9z9hUI60cD8r351jMQ2aMV+ba0NT/El2P7WWumRpW+7gkAu
-uUwlnybtBTF7J2aDoA/M+vN6AkuWlJUc3A5TnsKQE1KkLmENp8ofD8UgUZjlQP8H
-JBQ7YnPzdpCdh1yI1uOn6rxYkFq5BR+Wqj6wI9oYMTPSiZFhTnC1zYC1wJuJRR70
-imkMHZsJ3Ov4vMCBfnkf7ONte/HUcc14VW8q/vmiGONfER/JXm1D+bJHwZGBerHC
-4s369aikQMYGi3mav6GIUQOPrnPCQpOmocl0QsG/QTcKJot1K4kDR3uwAsOy
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----

+MIIEajCCAx6gAwIBAgIGAWAB8kgpMEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUD

+BAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIDBjMQ8wDQYD

+VQQDDAZQU1MtQ0ExFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3Rh

+bjEPMA0GA1UEBwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxCzAJBgNVBAYTAkRFMCAX

+DTk5MTIzMTIzMDAwMFoYDzIwOTkxMjMxMjMwMDAwWjBjMQ8wDQYDVQQDDAZQU1Mt

+Q0ExFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3RhbjEPMA0GA1UE

+BwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxCzAJBgNVBAYTAkRFMIIBIjANBgkqhkiG

+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg6QT4bJpuTGy2+eG1h4O22XQwCWz2wAmerQd

+xK1oFeXzfOUR0cnpGBDvhIzprK7Ino0SKuV9WBDCw8wQakx45Y1YNoQJ7Y816B1d

+cu2IsRX5T+CwAC5awJIMOYKN+izb7ad5ZvOBKZbr0I0kTut7ZtKJS67IUH/RqxXY

+KsOLOkTtpiTKGMLMUPOjFgbhVxzn8z9p8zgwNbrSXlUVazsov3JfB6xVQRu6wNSw

+i1K9c3NmJPD+jN+F2Ga1Y1bhEI2GJUBsulg5nfJ9y+p5Xez8OsqM3vMZ9ukhl0l9

+UwHxebwzRKL/yad3iXiPAV7a2tluZs2WgnlHlTTMSVBDTgzVgQIDAQABo4G5MIG2

+MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MIGSBgNVHSMEgYowgYeA

+FDb1lDgJxpP73FY8su+YiBZJsZ9coWekZTBjMQ8wDQYDVQQDDAZQU1MtQ0ExFDAS

+BgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3RhbjEPMA0GA1UEBwwGQm9j

+aHVtMQwwCgYDVQQIDANOUlcxCzAJBgNVBAYTAkRFggYBYAHySCkwQQYJKoZIhvcN

+AQEKMDSgDzANBglghkgBZQMEAgEFAKEcMBoGCSqGSIb3DQEBCDANBglghkgBZQME

+AgEFAKIDAgEgA4IBAQAj45MXBTbkT7M07h+EFBnjCTZ7SriCw3nhZAjSqK35EjGH

+l66YRr/oaqgyWaL67TBDNG0yUtW42chOXmbvgwryvKganUjJsOmaYqOng1V4C6N2

+2ld+pMvQSLG1q6O1lfJLKRMKfbEuwoza8CiBXqzrKFA1LIc8RgWQ83pyGSsdK6yq

+fpExGBDk8tZI5pVLiSfINcqStr+tSt8egrkD4O437li0paALfL719jVjH3vL6L+T

+dZ89ty1Pv30bvipPe0SUGtiUiNEvdR+ia8WJtjKq18mKwklPH/DmhS5IuNawwoo5

+XXNV7igmlyKvO+yoa67HNw1w0d4tRCEQJnM38zuV

+-----END CERTIFICATE-----

diff --git a/src/tests/data/x509/pss_certs/04/end.crt b/src/tests/data/x509/pss_certs/04/end.crt
index b4269b27f..e83a40df8 100644
--- a/src/tests/data/x509/pss_certs/04/end.crt
+++ b/src/tests/data/x509/pss_certs/04/end.crt
@@ -1,54 +1,53 @@
------BEGIN CERTIFICATE-----
-MIIErzCCA2OgAwIBAgIGAVyhu3riMEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUD
-BAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIDBoMQ8wDQYD
-VQQDDAZQU1MtQ0ExFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3Rh
-bjEPMA0GA1UEBwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxEDAOBgNVBAYTB0dlcm1h
-bnkwIBcNOTkxMjMxMjMwMDAwWhgPMjA5OTEyMzEyMzAwMDBaMG8xFjAUBgNVBAMM
-DVBTUy1EaXNrLUNlcnQxFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVC
-b3RhbjEPMA0GA1UEBwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxEDAOBgNVBAYTB0dl
-cm1hbnkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCViOl2DheS1Fks
-/IJDP+IYawWWtEh7RAJRd5wz1oSoK0i4I8Yg12JzkFuhypIUOQlT92woDN+nIwc/
-+Ifl8LelowIjZNkdL+oERP++SOzQu6r1lXlIHDS9hEcNF/40YhyKKMxCwTa9KqGO
-qAWiPfXu6uFKQlPMorFwY/t3gbDdWAcNQl4XRSjQEk7fnZO2N4mSpCWxB1BuMRPE
-UAe3beuzSi5jGEDHXXNBk5imk3FfzJ7MctnYU0agWW4fuMJ/zmNLPQ/FMklST6cK
-nweA5pMuJyTw2gHTnReOR5i9J0WuHu1r3QuwBVg2eWiavIdonYTw9xqagaCv4EJO
-umkxlsJPAgMBAAGjge0wgeowDgYDVR0PAQH/BAQDAgUgMAwGA1UdEwEB/wQCMAAw
-gZcGA1UdIwSBjzCBjIAUeeWKHA17MLP/T5B8N40mM8cdSU6hbKRqMGgxDzANBgNV
-BAMMBlBTUy1DQTEUMBIGA1UECwwLQm90YW4tVGVzdHMxDjAMBgNVBAoMBUJvdGFu
-MQ8wDQYDVQQHDAZCb2NodW0xDDAKBgNVBAgMA05SVzEQMA4GA1UEBhMHR2VybWFu
-eYIGAVygrFzUMBgGA1UdEQQRMA+CDVBTUy1EaXNrLUNlcnQwFgYDVR0lBA8wDQYL
-KwYBBAGB630NAQEwQQYJKoZIhvcNAQEKMDSgDzANBglghkgBZQMEAgEFAKEcMBoG
-CSqGSIb3DQEBCDANBglghkgBZQMEAgEFAKIDAgEgA4IBAQB19KCooYqEpGrYD8Go
-cUlSq31F8nUWfcO2cm5qDg3D74LXfrMqIDxB7ZFkkaR72bBUsOvKlgnklPvIq/iG
-8ELCIgY13XWt9xmzkXMw08Y0CKZq5JmZDP3C9SB2l4lhDVPpqI+tOfzDBPk+g/Mp
-t6fF+j3V2ZYB0iYN/iNoyX0gldpQeJc4JE3VSOKixFW+SALFZm1aHMVEGBJwWBnp
-VAF2LRB6cVKn26eHdU9B2Cxc7puqQX/VPjoY+OtMv9IugQVAd1aeb0Fj86f2yFhc
-FVlS/4Zf7EllJtIsXJXVyhbc6AR3Phvf2Bl2PkUAKLEZ9b7WTNfXdv3cmSmsOo20
-aWDg
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIEeTCCAy2gAwIBAgIGAVygrFzUMEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUD
-BAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIDBoMQ8wDQYD
-VQQDDAZQU1MtQ0ExFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3Rh
-bjEPMA0GA1UEBwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxEDAOBgNVBAYTB0dlcm1h
-bnkwIBcNOTkxMjMxMjMwMDAwWhgPMjA5OTEyMzEyMzAwMDBaMGgxDzANBgNVBAMM
-BlBTUy1DQTEUMBIGA1UECwwLQm90YW4tVGVzdHMxDjAMBgNVBAoMBUJvdGFuMQ8w
-DQYDVQQHDAZCb2NodW0xDDAKBgNVBAgMA05SVzEQMA4GA1UEBhMHR2VybWFueTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZpazi/xuB2EDdsNCln3XAz
-njxyuwsGetZ4PK9OfEoxaDznFIv8Ll/MV2nO8tG5BiUzxw1KbfOFJOFKFaT1r7Y6
-/ipzOEAN+0ixx8c2PQWTs5oc1k4yJmhf8UpWHmqfyH4dXNqgJG2n3+3m8pK4D/G2
-ciE+fPaSHpJF1I0lQ+g+zKHoq2J1HR0KOz6hQBMSOxNe557GGecgKPwsnI7cJMFS
-CRUtA3njIhxcPNMix332NLz6Hi3H5TxPA+o3Y/Demfs/quauM3hb7M/DyLZ9k3no
-IUsQiSCZC8JyUkHTJAoRlL5FHPWP4CkKQ7CBF8evaiVm/RBZfI2CZ1ygTXaNOW8C
-AwEAAaOBvjCBuzAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zCBlwYD
-VR0jBIGPMIGMgBR55YocDXsws/9PkHw3jSYzxx1JTqFspGowaDEPMA0GA1UEAwwG
-UFNTLUNBMRQwEgYDVQQLDAtCb3Rhbi1UZXN0czEOMAwGA1UECgwFQm90YW4xDzAN
-BgNVBAcMBkJvY2h1bTEMMAoGA1UECAwDTlJXMRAwDgYDVQQGEwdHZXJtYW55ggYB
-XKCsXNQwQQYJKoZIhvcNAQEKMDSgDzANBglghkgBZQMEAgEFAKEcMBoGCSqGSIb3
-DQEBCDANBglghkgBZQMEAgEFAKIDAgEgA4IBAQAtcKFeatctcgDoJdx5nPK5JLrp
-cQL09M1DEDvmw+qlo9z9hUI60cD8r351jMQ2aMV+ba0NT/El2P7WWumRpW+7gkAu
-uUwlnybtBTF7J2aDoA/M+vN6AkuWlJUc3A5TnsKQE1KkLmENp8ofD8UgUZjlQP8H
-JBQ7YnPzdpCdh1yI1uOn6rxYkFq5BR+Wqj6wI9oYMTPSiZFhTnC1zYC1wJuJRR70
-imkMHZsJ3Ov4vMCBfnkf7ONte/HUcc14VW8q/vmiGONfER/JXm1D+bJHwZGBerHC
-4s369aikQMYGi3mav6GIUQOPrnPCQpOmocl0QsG/QTcKJot1K4kDR3uwAsOy
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----

+MIIEljCCA0qgAwIBAgIGAWAB9gf1MEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUD

+BAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIDBjMQ8wDQYD

+VQQDDAZQU1MtQ0ExFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3Rh

+bjEPMA0GA1UEBwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxCzAJBgNVBAYTAkRFMCAX

+DTAwMTIzMTIzMDAwMFoYDzIwOTgxMjMxMjMwMDAwWjBlMREwDwYDVQQDDAhQU1Mt

+Q2VydDEUMBIGA1UECwwLQm90YW4tVGVzdHMxDjAMBgNVBAoMBUJvdGFuMQ8wDQYD

+VQQHDAZCb2NodW0xDDAKBgNVBAgMA05SVzELMAkGA1UEBhMCREUwggEiMA0GCSqG

+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCD9AimnF+OhedVEzGPoKdkMufi7LD9TAWH

+hmpUYe7bHEd5m5IPg3CognneOuPKSMipg2TIyuEeV8XgD/TwGJHyeoVWjqQThq0S

+vi4nQI5SS3pqTpyguPDzvUaHepbKf9/LnhWHFngFrv1GRG5dvJrwMumED5VrIEdK

+Hb2GfG6P67nOIekZfnv6JMwHOjuiJ6rlKVtPDoXqdm4knl8k064QldyWG3ZmP5Dz

+K1KouRsb1Dyf/kmiY0dUopGe7236wtYAZFj2RJByFV+QbCV6+hUk8qaiw6W3JApv

+jltztIZuz4Y63Cz6m5ROb8f0osl/3Vq4tniOvfMovUoFVjzcHAhdAgMBAAGjgeMw

+geAwDgYDVR0PAQH/BAQDAgUgMAwGA1UdEwEB/wQCMAAwgZIGA1UdIwSBijCBh4AU

+NvWUOAnGk/vcVjyy75iIFkmxn1yhZ6RlMGMxDzANBgNVBAMMBlBTUy1DQTEUMBIG

+A1UECwwLQm90YW4tVGVzdHMxDjAMBgNVBAoMBUJvdGFuMQ8wDQYDVQQHDAZCb2No

+dW0xDDAKBgNVBAgMA05SVzELMAkGA1UEBhMCREWCBgFgAfJIKTATBgNVHREEDDAK

+gghQU1MtQ2VydDAWBgNVHSUEDzANBgsrBgEEAYHrfQ0BATBBBgkqhkiG9w0BAQow

+NKAPMA0GCWCGSAFlAwQCAQUAoRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAQUA

+ogMCASADggEBAGcIe3q6jTKjSGrD2xi512DUnZEPhqxrU7lUiXc+Q86QUQmr070R

+jy8g5uMHGe+/UUFbA0CMpopQgk6tIB1mfm6x5dX2SaQ6wgnEUx3FaSSVDQQGab/0

+Fb142s+2I3gt28uLr40YGZuRYz4GKdgZdC4D1+KR6ef9vRNdCfgwVCAUJFmuplSf

+yQo3/rufmV7PUS8M2q+/GYehoR/h8fX1TKCpeQQMrA8LLvt+FCF6J4xrwf9F5O+p

+lIDNFHhvKeN7ORLy+Xvxy3E9CD0pqbxn7CrAd/Arl3GCGAjELfncWaP7qV72RmkG

+LHNDGT/zvvX+TU3R1Q7eI5fiIL/OJvGn5/w=

+-----END CERTIFICATE-----

+-----BEGIN CERTIFICATE-----

+MIIEajCCAx6gAwIBAgIGAWAB8kgpMEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUD

+BAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIDBjMQ8wDQYD

+VQQDDAZQU1MtQ0ExFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3Rh

+bjEPMA0GA1UEBwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxCzAJBgNVBAYTAkRFMCAX

+DTk5MTIzMTIzMDAwMFoYDzIwOTkxMjMxMjMwMDAwWjBjMQ8wDQYDVQQDDAZQU1Mt

+Q0ExFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3RhbjEPMA0GA1UE

+BwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxCzAJBgNVBAYTAkRFMIIBIjANBgkqhkiG

+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg6QT4bJpuTGy2+eG1h4O22XQwCWz2wAmerQd

+xK1oFeXzfOUR0cnpGBDvhIzprK7Ino0SKuV9WBDCw8wQakx45Y1YNoQJ7Y816B1d

+cu2IsRX5T+CwAC5awJIMOYKN+izb7ad5ZvOBKZbr0I0kTut7ZtKJS67IUH/RqxXY

+KsOLOkTtpiTKGMLMUPOjFgbhVxzn8z9p8zgwNbrSXlUVazsov3JfB6xVQRu6wNSw

+i1K9c3NmJPD+jN+F2Ga1Y1bhEI2GJUBsulg5nfJ9y+p5Xez8OsqM3vMZ9ukhl0l9

+UwHxebwzRKL/yad3iXiPAV7a2tluZs2WgnlHlTTMSVBDTgzVgQIDAQABo4G5MIG2

+MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MIGSBgNVHSMEgYowgYeA

+FDb1lDgJxpP73FY8su+YiBZJsZ9coWekZTBjMQ8wDQYDVQQDDAZQU1MtQ0ExFDAS

+BgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3RhbjEPMA0GA1UEBwwGQm9j

+aHVtMQwwCgYDVQQIDANOUlcxCzAJBgNVBAYTAkRFggYBYAHySCkwQQYJKoZIhvcN

+AQEKMDSgDzANBglghkgBZQMEAgEFAKEcMBoGCSqGSIb3DQEBCDANBglghkgBZQME

+AgEFAKIDAgEgA4IBAQAj45MXBTbkT7M07h+EFBnjCTZ7SriCw3nhZAjSqK35EjGH

+l66YRr/oaqgyWaL67TBDNG0yUtW42chOXmbvgwryvKganUjJsOmaYqOng1V4C6N2

+2ld+pMvQSLG1q6O1lfJLKRMKfbEuwoza8CiBXqzrKFA1LIc8RgWQ83pyGSsdK6yq

+fpExGBDk8tZI5pVLiSfINcqStr+tSt8egrkD4O437li0paALfL719jVjH3vL6L+T

+dZ89ty1Pv30bvipPe0SUGtiUiNEvdR+ia8WJtjKq18mKwklPH/DmhS5IuNawwoo5

+XXNV7igmlyKvO+yoa67HNw1w0d4tRCEQJnM38zuV

+-----END CERTIFICATE-----

diff --git a/src/tests/data/x509/pss_certs/04/root.crt b/src/tests/data/x509/pss_certs/04/root.crt
index deb03ade9..253e616bf 100644
--- a/src/tests/data/x509/pss_certs/04/root.crt
+++ b/src/tests/data/x509/pss_certs/04/root.crt
@@ -1,26 +1,26 @@
------BEGIN CERTIFICATE-----
-MIIEeTCCAy2gAwIBAgIGAVygrFzUMEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUD
-BAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIDBoMQ8wDQYD
-VQQDDAZQU1MtQ0ExFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3Rh
-bjEPMA0GA1UEBwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxEDAOBgNVBAYTB0dlcm1h
-bnkwIBcNOTkxMjMxMjMwMDAwWhgPMjA5OTEyMzEyMzAwMDBaMGgxDzANBgNVBAMM
-BlBTUy1DQTEUMBIGA1UECwwLQm90YW4tVGVzdHMxDjAMBgNVBAoMBUJvdGFuMQ8w
-DQYDVQQHDAZCb2NodW0xDDAKBgNVBAgMA05SVzEQMA4GA1UEBhMHR2VybWFueTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZpazi/xuB2EDdsNCln3XAz
-njxyuwsGetZ4PK9OfEoxaDznFIv8Ll/MV2nO8tG5BiUzxw1KbfOFJOFKFaT1r7Y6
-/ipzOEAN+0ixx8c2PQWTs5oc1k4yJmhf8UpWHmqfyH4dXNqgJG2n3+3m8pK4D/G2
-ciE+fPaSHpJF1I0lQ+g+zKHoq2J1HR0KOz6hQBMSOxNe557GGecgKPwsnI7cJMFS
-CRUtA3njIhxcPNMix332NLz6Hi3H5TxPA+o3Y/Demfs/quauM3hb7M/DyLZ9k3no
-IUsQiSCZC8JyUkHTJAoRlL5FHPWP4CkKQ7CBF8evaiVm/RBZfI2CZ1ygTXaNOW8C
-AwEAAaOBvjCBuzAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zCBlwYD
-VR0jBIGPMIGMgBR55YocDXsws/9PkHw3jSYzxx1JTqFspGowaDEPMA0GA1UEAwwG
-UFNTLUNBMRQwEgYDVQQLDAtCb3Rhbi1UZXN0czEOMAwGA1UECgwFQm90YW4xDzAN
-BgNVBAcMBkJvY2h1bTEMMAoGA1UECAwDTlJXMRAwDgYDVQQGEwdHZXJtYW55ggYB
-XKCsXNQwQQYJKoZIhvcNAQEKMDSgDzANBglghkgBZQMEAgEFAKEcMBoGCSqGSIb3
-DQEBCDANBglghkgBZQMEAgEFAKIDAgEgA4IBAQAtcKFeatctcgDoJdx5nPK5JLrp
-cQL09M1DEDvmw+qlo9z9hUI60cD8r351jMQ2aMV+ba0NT/El2P7WWumRpW+7gkAu
-uUwlnybtBTF7J2aDoA/M+vN6AkuWlJUc3A5TnsKQE1KkLmENp8ofD8UgUZjlQP8H
-JBQ7YnPzdpCdh1yI1uOn6rxYkFq5BR+Wqj6wI9oYMTPSiZFhTnC1zYC1wJuJRR70
-imkMHZsJ3Ov4vMCBfnkf7ONte/HUcc14VW8q/vmiGONfER/JXm1D+bJHwZGBerHC
-4s369aikQMYGi3mav6GIUQOPrnPCQpOmocl0QsG/QTcKJot1K4kDR3uwAsOy
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----

+MIIEajCCAx6gAwIBAgIGAWAB8kgpMEEGCSqGSIb3DQEBCjA0oA8wDQYJYIZIAWUD

+BAIBBQChHDAaBgkqhkiG9w0BAQgwDQYJYIZIAWUDBAIBBQCiAwIBIDBjMQ8wDQYD

+VQQDDAZQU1MtQ0ExFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3Rh

+bjEPMA0GA1UEBwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxCzAJBgNVBAYTAkRFMCAX

+DTk5MTIzMTIzMDAwMFoYDzIwOTkxMjMxMjMwMDAwWjBjMQ8wDQYDVQQDDAZQU1Mt

+Q0ExFDASBgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3RhbjEPMA0GA1UE

+BwwGQm9jaHVtMQwwCgYDVQQIDANOUlcxCzAJBgNVBAYTAkRFMIIBIjANBgkqhkiG

+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg6QT4bJpuTGy2+eG1h4O22XQwCWz2wAmerQd

+xK1oFeXzfOUR0cnpGBDvhIzprK7Ino0SKuV9WBDCw8wQakx45Y1YNoQJ7Y816B1d

+cu2IsRX5T+CwAC5awJIMOYKN+izb7ad5ZvOBKZbr0I0kTut7ZtKJS67IUH/RqxXY

+KsOLOkTtpiTKGMLMUPOjFgbhVxzn8z9p8zgwNbrSXlUVazsov3JfB6xVQRu6wNSw

+i1K9c3NmJPD+jN+F2Ga1Y1bhEI2GJUBsulg5nfJ9y+p5Xez8OsqM3vMZ9ukhl0l9

+UwHxebwzRKL/yad3iXiPAV7a2tluZs2WgnlHlTTMSVBDTgzVgQIDAQABo4G5MIG2

+MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MIGSBgNVHSMEgYowgYeA

+FDb1lDgJxpP73FY8su+YiBZJsZ9coWekZTBjMQ8wDQYDVQQDDAZQU1MtQ0ExFDAS

+BgNVBAsMC0JvdGFuLVRlc3RzMQ4wDAYDVQQKDAVCb3RhbjEPMA0GA1UEBwwGQm9j

+aHVtMQwwCgYDVQQIDANOUlcxCzAJBgNVBAYTAkRFggYBYAHySCkwQQYJKoZIhvcN

+AQEKMDSgDzANBglghkgBZQMEAgEFAKEcMBoGCSqGSIb3DQEBCDANBglghkgBZQME

+AgEFAKIDAgEgA4IBAQAj45MXBTbkT7M07h+EFBnjCTZ7SriCw3nhZAjSqK35EjGH

+l66YRr/oaqgyWaL67TBDNG0yUtW42chOXmbvgwryvKganUjJsOmaYqOng1V4C6N2

+2ld+pMvQSLG1q6O1lfJLKRMKfbEuwoza8CiBXqzrKFA1LIc8RgWQ83pyGSsdK6yq

+fpExGBDk8tZI5pVLiSfINcqStr+tSt8egrkD4O437li0paALfL719jVjH3vL6L+T

+dZ89ty1Pv30bvipPe0SUGtiUiNEvdR+ia8WJtjKq18mKwklPH/DmhS5IuNawwoo5

+XXNV7igmlyKvO+yoa67HNw1w0d4tRCEQJnM38zuV

+-----END CERTIFICATE-----