Your message dated Sat, 10 Feb 2024 13:02:56 +0000 with message-id <E1rYn0S-002xq1-8N@coccia.debian.org> and subject line Released with 11.9 has caused the Debian Bug report #1055988, regarding bullseye-pu: package symfony/4.4.19+dfsg-2+deb11u4 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 1055988: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1055988 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: bullseye-pu: package symfony/4.4.19+dfsg-2+deb11u4
- From: David Prévot <taffit@debian.org>
- Date: Wed, 15 Nov 2023 14:04:50 +0100
- Message-id: <ZVTB8qylFl6efa5q@persil.tilapin.org>
Package: release.debian.org Severity: normal Tags: bullseye User: release.debian.org@packages.debian.org Usertags: pu X-Debbugs-Cc: symfony@packages.debian.org, Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org> Control: affects -1 + src:symfony Hi, As per #1055986 for Bookworm, I’d like to fix the following security issue in the next point release, as advised by the security team (they do not intend to issue a DSA for that). [TwigBridge] Ensure CodeExtension's filters properly escape their input [CVE-2023-46734] (Closes: #1055774) It also fixes the testsuite using a patch prepared a while ago. [Mime] regenerate test certificates (Closes: #1034854) I didn’t test the packages thoroughly (and I’m not sure to have much time for a while), but at least the testsuites pass. [ Checklist ] [x] *all* changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in (old)stable [x] the issue is verified as fixed in unstable Thanks in advance, taffitdiff -Nru symfony-4.4.19+dfsg/debian/changelog symfony-4.4.19+dfsg/debian/changelog --- symfony-4.4.19+dfsg/debian/changelog 2023-02-27 23:05:34.000000000 +0100 +++ symfony-4.4.19+dfsg/debian/changelog 2023-11-11 19:09:20.000000000 +0100 @@ -1,3 +1,12 @@ +symfony (4.4.19+dfsg-2+deb11u4) bullseye; urgency=medium + + * [Mime] regenerate test certificates (Closes: #1034854) + * Backport security fix from Symfony 4.4.51 + - [TwigBridge] Ensure CodeExtension's filters properly escape their input + [CVE-2023-46734] (Closes: #1055774) + + -- David Prévot <taffit@debian.org> Sat, 11 Nov 2023 19:09:20 +0100 + symfony (4.4.19+dfsg-2+deb11u3) bullseye; urgency=medium * Drop dependency bump. diff -Nru symfony-4.4.19+dfsg/debian/patches/Mime-regenerate-test-certificates.patch symfony-4.4.19+dfsg/debian/patches/Mime-regenerate-test-certificates.patch --- symfony-4.4.19+dfsg/debian/patches/Mime-regenerate-test-certificates.patch 1970-01-01 01:00:00.000000000 +0100 +++ symfony-4.4.19+dfsg/debian/patches/Mime-regenerate-test-certificates.patch 2023-11-11 19:09:20.000000000 +0100 @@ -0,0 +1,801 @@ +From: Nicolas Grekas <nicolas.grekas@gmail.com> +Date: Wed, 19 Apr 2023 11:49:13 +0200 +Subject: [Mime] regenerate test certificates + +Origin: upstream, http://github.com/symfony/symfony/commit/0e5e8754fd793b71202ac8554916b55410d4d08f +Bug-Debian: https://bugs.debian.org/1034854 +--- + src/Symfony/Component/Mime/Tests/_data/ca.crt | 36 +++++++------ + src/Symfony/Component/Mime/Tests/_data/ca.key | 55 ++++++++++---------- + .../Component/Mime/Tests/_data/create-cert.sh | 14 ++--- + src/Symfony/Component/Mime/Tests/_data/encrypt.crt | 34 ++++++------ + src/Symfony/Component/Mime/Tests/_data/encrypt.key | 55 ++++++++++---------- + .../Component/Mime/Tests/_data/encrypt2.crt | 34 ++++++------ + .../Component/Mime/Tests/_data/encrypt2.key | 55 ++++++++++---------- + .../Component/Mime/Tests/_data/intermediate.crt | 32 ++++++------ + .../Component/Mime/Tests/_data/intermediate.key | 55 ++++++++++---------- + src/Symfony/Component/Mime/Tests/_data/sign.crt | 36 ++++++------- + src/Symfony/Component/Mime/Tests/_data/sign.key | 55 ++++++++++---------- + src/Symfony/Component/Mime/Tests/_data/sign2.crt | 32 ++++++------ + src/Symfony/Component/Mime/Tests/_data/sign2.key | 55 ++++++++++---------- + src/Symfony/Component/Mime/Tests/_data/sign3.crt | 34 ++++++------ + src/Symfony/Component/Mime/Tests/_data/sign3.key | 60 +++++++++++----------- + 15 files changed, 325 insertions(+), 317 deletions(-) + +diff --git a/src/Symfony/Component/Mime/Tests/_data/ca.crt b/src/Symfony/Component/Mime/Tests/_data/ca.crt +index bca02b3..0418947 100644 +--- a/src/Symfony/Component/Mime/Tests/_data/ca.crt ++++ b/src/Symfony/Component/Mime/Tests/_data/ca.crt +@@ -1,19 +1,21 @@ + -----BEGIN CERTIFICATE----- +-MIIDFDCCAfwCCQDaMw8tuy1dgDANBgkqhkiG9w0BAQsFADBMMRcwFQYDVQQDDA5T +-eW1mb255TWltZSBDQTEUMBIGA1UECgwLU3ltZm9ueU1pbWUxDjAMBgNVBAcMBVBh +-cmlzMQswCQYDVQQGEwJGUjAeFw0xOTA0MTkxNDIwMTFaFw0yMzA0MTgxNDIwMTFa +-MEwxFzAVBgNVBAMMDlN5bWZvbnlNaW1lIENBMRQwEgYDVQQKDAtTeW1mb255TWlt +-ZTEOMAwGA1UEBwwFUGFyaXMxCzAJBgNVBAYTAkZSMIIBIjANBgkqhkiG9w0BAQEF +-AAOCAQ8AMIIBCgKCAQEAnvxOWE8qOVkuYbTu6u4Oao2n91FPF6umrcF8mq0uD2G0 +-dtOJuFaR7FeElmJnHfWvqvesCigXyA7kpdVBFGhEo83SGYTbPSGzehWDc7Kvc321 +-UPvNb61T2Ekdo+5ufrpbzlOPtTTaVL98dFEZntYNM3CXnnSSdeKz38NlHHV3QsDZ +-crQRMxHrYi2bgkhxVoAY03ZQRbb95rEE1cfyGZ0x6VSBrVC2nnEUT2vopwny/vy+ +-QSn3oga+ucMkxJdoD8MA13Zh5I4Uiozl82xoWH/zmVrqrrO2lNBv7WYOnwbv6MSr +-5kCE3Kcqzs8qAGv62GYyS4exIMEZsbbPv3cvp9hgYQIDAQABMA0GCSqGSIb3DQEB +-CwUAA4IBAQBuJtPqAX6ApOymDux9sRqxx5FMIIEX2TmanSSSLesP0AVVLv8Am8/p +-Xs8N9e49KoQhnQ3FmdtwY6IV6f3yIMnZxmkXZoUi4zCkSZd/+2iap1c51zV1b6NC +-4C5LZtdWzhons4jOmtmxaMSy08oPPYv1wXATjjfHvqqYa/7axLY1mqbxLYC437Fv +-H5zkdzQM2qXpIgtCjlXfOd/L9Az5DTSH4UvWiiocRdmnxGP+nMEOuUUvLzokJSeq +-Otw4gjxczF8NQ/g/io6iG3w4OfjgRrCpuMv/l3eYClC7vDXOX9S172CpzaD/qkHM +-NFxckxTgT4ylmivmHZWym4xS1bkAAAsd ++MIIDezCCAmOgAwIBAgIUKNDGaUuFySYydOZQtTHeSRgVCXUwDQYJKoZIhvcNAQEL ++BQAwTDEXMBUGA1UEAwwOU3ltZm9ueU1pbWUgQ0ExFDASBgNVBAoMC1N5bWZvbnlN ++aW1lMQ4wDAYDVQQHDAVQYXJpczELMAkGA1UEBhMCRlIwIBcNMjMwNDE5MDk0ODE0 ++WhgPMjQyMzAxMTIwOTQ4MTRaMEwxFzAVBgNVBAMMDlN5bWZvbnlNaW1lIENBMRQw ++EgYDVQQKDAtTeW1mb255TWltZTEOMAwGA1UEBwwFUGFyaXMxCzAJBgNVBAYTAkZS ++MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAopnLZXtGDaSdz/90ViQy ++De/UoYPRcowFuIvykM2nUV3RZ87xrUcqA3W4Zb6EKTngM/8FBylvHs5VGaWK9W88 ++M/CxOg85+CKBel33OsVBGllfwbIPDhRuWMtZ3OlShCiVijFXnqQ4z/vF2Q9Qpjm7 ++KmC1oi8A5CUU3woCeumKoL6MzwZEHSYMetIA+OvJ66yU+W3IsDT5kKPAiflT7Cln ++toQPOnOxdj2BMMIOW5MH2iK3NOIq6fE0cXbB4s21qrspVbmXVEwEcujdgC+enzS8 ++QTKLXwoAX7vdWy7iJWQQyIupn344eZyx1J9sRtDJ3BcOfuZmnGY4tQLsTpFOrjTb ++7QIDAQABo1MwUTAdBgNVHQ4EFgQUE09xg+VK6LDWMfH/MmEcKgqtRvUwHwYDVR0j ++BBgwFoAUE09xg+VK6LDWMfH/MmEcKgqtRvUwDwYDVR0TAQH/BAUwAwEB/zANBgkq ++hkiG9w0BAQsFAAOCAQEAUpaNbpJa007Mq0t1JcswjlA2YRCinO+jP67RUCIZ+ILV ++8QRLhQvM740lV1SjNON3zupW1Wmd1sEuDUS5Ext0kJrkKbsNGIqh9vKWSnqqft7r ++zgyHekcO/2JaOnT74RCysTeKob1c3NJyLfgF9rwJ3Gb7YdP8UDMlvLsNl8kH2W+3 ++ulMy4sAb9M0dE9gTbcMNrFVmvh1u17rLcFCq5uXEZvHXUCaHj0bchCmJxNNwRAOT ++PcqeYhMToCKgZQeVIoCb7KONVwesV4LYWH6xseiQeM4es4EgV3uIdlwis41bSTge ++wHA3V4syU49HlDNV4hRPfglK7pUJg9huQ373Wl13LQ== + -----END CERTIFICATE----- +diff --git a/src/Symfony/Component/Mime/Tests/_data/ca.key b/src/Symfony/Component/Mime/Tests/_data/ca.key +index 4832a1d..00f626d 100644 +--- a/src/Symfony/Component/Mime/Tests/_data/ca.key ++++ b/src/Symfony/Component/Mime/Tests/_data/ca.key +@@ -1,27 +1,28 @@ +------BEGIN RSA PRIVATE KEY----- +-MIIEowIBAAKCAQEAnvxOWE8qOVkuYbTu6u4Oao2n91FPF6umrcF8mq0uD2G0dtOJ +-uFaR7FeElmJnHfWvqvesCigXyA7kpdVBFGhEo83SGYTbPSGzehWDc7Kvc321UPvN +-b61T2Ekdo+5ufrpbzlOPtTTaVL98dFEZntYNM3CXnnSSdeKz38NlHHV3QsDZcrQR +-MxHrYi2bgkhxVoAY03ZQRbb95rEE1cfyGZ0x6VSBrVC2nnEUT2vopwny/vy+QSn3 +-oga+ucMkxJdoD8MA13Zh5I4Uiozl82xoWH/zmVrqrrO2lNBv7WYOnwbv6MSr5kCE +-3Kcqzs8qAGv62GYyS4exIMEZsbbPv3cvp9hgYQIDAQABAoIBAD/Y1WGzkSJsxSqp +-7dTc+18hOlYhCiFYZtyaun6nk7rLoxyhQUqNQZbnYrC+HekzNHP1eNqvVTWbfYl3 +-heY7JW2fB4QGDcGUGi6qGxtIpBs+XaWDKfJyahyO6F9gLnGoR5wphKnh6thj+ggA +-Vciq76w7yDfzWqoK+++d2ao/JkDg7YrpOQonfceYgjTtiXXFDV4cm4GgKr7gWolt +-AqZbHcbH6pmbwRduT+g5QjsYmYPven/ji6Mr2eTFwE0qjlwj4LHlEWuKgpwAnLc/ +-jzdnx3UjRGTbiMnbxrv4sHApW9Bb02aRWHVG3axkxWFyWefKuGRvXUZAguGvMpeq +-Ng6Jc9ECgYEA0YpHxa32IFRzkOC7Vs79uKWmkbiYZihSrAyCG7Xo5rxTtB5HUcB+ +-qIrFU2t2OSDffrRS5C6Ewpw3kBgYElsoYyqL/h1Kb+SQzZVwgK3PAF9p4mcgzyCU +-Q25Nqy2CyX3gZblQMK6ui5aI7ZC3WE2wl8fxAneZOtHEEw2e0DaiUP0CgYEAwjx+ +-gQr+NHFbDSfhh1IdIz+kGBgR+TS0OIjE2/Mb5IUfDzMsWGo0JEpTH1ma+e7VrxCC +-9o47dvz5PXlHAuxsgLEXN7NEPqhiluAbTG/YEpsYeqftqKJsFROmFa3TDeEp3LGz +-2OVY/uZjxNVVfljS/weGhOXGfATwQQoAUFbEzDUCgYEAznRsmvz4EIqlAw4qBzIT +-EydDozg6EA2Sxynb1+m3+/96iXF727TKFs4D9llfNpKJIpIRSfn7nLPGmxbiQNPI +-S0zUeh/qA600bxraqi6WUkuwS/5IeUwkSPwZUpuYzWZU/mVD+XNjTu2XJFr+Cuch +-I6tAb6nfM/ESO6Oj4oqyCxECgYBsXr4iF1UPQ3OOmoKtMnZJVVejjcJxbSNkK4LS +-SQh17oQOwflq9w5SdRl9c0wRSFz2iNrY3zB0Sd5xmvmwuuIqxyNyE1XvM5mWHkF8 +-2yYN83Sr8oeZv81X0ReoHsyTgN4PYSI70HJf/YEKsBA8JyjJ25QFEAI27bZyQzc7 +-m72/RQKBgEtyibh8X7DC9B3oVMZAX1BJJDzDSH1RyRaoa+7nARSl90qJD877NZ8o +-jteoRFNJJzruADouffK+lTlMtwdfQJQW4wGYGiyr1S5dKXNsPmcnKCj7HbvBphVA +-oCzZi3txFcOmH4IZ5HA0VxvGViQwV7fyl5ch7XVqSFOeFaa6lIF5 +------END RSA PRIVATE KEY----- ++-----BEGIN PRIVATE KEY----- ++MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCimctle0YNpJ3P ++/3RWJDIN79Shg9FyjAW4i/KQzadRXdFnzvGtRyoDdbhlvoQpOeAz/wUHKW8ezlUZ ++pYr1bzwz8LE6Dzn4IoF6Xfc6xUEaWV/Bsg8OFG5Yy1nc6VKEKJWKMVeepDjP+8XZ ++D1CmObsqYLWiLwDkJRTfCgJ66YqgvozPBkQdJgx60gD468nrrJT5bciwNPmQo8CJ +++VPsKWe2hA86c7F2PYEwwg5bkwfaIrc04irp8TRxdsHizbWquylVuZdUTARy6N2A ++L56fNLxBMotfCgBfu91bLuIlZBDIi6mffjh5nLHUn2xG0MncFw5+5macZji1AuxO ++kU6uNNvtAgMBAAECggEAA8Ej2GnGhhGfQDqAi+2lhztasEkMKMYxap+2n9/TxXXy ++XCCD5ZGfV3mcIqNJx27p7aFtkwsCoRY4ElHHed/R5swft3y7BK79SN9LEl0UIgDe ++zGjpXpSbsKqvXkG38UvDmi+F+6iElE7WtGqdXN035GRbxU0rCtmNWBIR2Rcz5369 ++bliAl6bOhcp8ePhUuBGkohyUtL9cj/E9ipAoaTRFpfMWkF5VAHxtIIrJ5TAfXZ5C ++GGlYT4sHFs+W+z+IpjpIcFjMAlDN0n2SyUjd34FTBZb5b65XknZVP+wp/fWqhlwo ++YPtnjuhmg6KcA+djURXDdqa0Bknrgqg0QNa8um9iSQKBgQC/pOhY4iqkMG+NVHq9 ++tbUDNu+Prwgk23vfa2QSgfYPvT1G6d2Ib6HpLwQmrp2NQlA1w/U8qlhAy9WXa/BX ++a6dv8yGTi40Sh2tEmtGof84JbNtdQXQpZzreUxCP5vBU9ySGfo4lpHFq0+xUqIfO ++IS+vDnW1bXgkit/5T5iBU64wZQKBgQDZNBv73ipzOlqgDrcNlMTpDUX2ID/EoIzV ++8e4eH5teBsUxt2srjUf2Emtm2tgIqDYHBChmQLlz6CspORJrxzrcAE6eTdTfLTB+ ++EFpspkherkcFEKOKyqybWJMQirjX2peFu4NqdBI1890l/uYbaYSx4gLem4F2Oq3a ++1uEw94qQ6QKBgENUe7EmnJac0cRUpt7Z5SOg/F99vh284vNmtnzuHfX/pXSxm3xg ++xAC53Pp+JKpJXwbUtuc+bc0uD/eoG4OLNgNV5zkAMWsOGri6r+hEJq4XCabk5Rva ++wcr0YgA8wbkIL1P1SJmfAZ3noMNJhpT8AdW9/crlD+2+wNvFhC4DqVIlAoGBAKU/ ++I9snVxx7VN9Y0qOef4De/E8YketCSmOqwAJjAY0zkWsVpI9p2Um5EcUa0ikj8Ja9 ++7w58R5uLEus15HHjDUC7axS9GisA8le2kVT/3SdLZ/TOh93b/B3j8V8waxit0YGI +++55N2Fz7v1Bc8SwBx1aeIJjDrmcIlaRcvs7GRcGhAoGBAJXyF9A7nw/OPbp/6dCB ++adllin7CFysh2gyzrmIQQM0zd+kT8bo/ToJ7zr2Gfy93+ku5LN/I+cvdUCxpj/Jo ++5qHiI3uv/w9+6ZA5aYaw6FrE3SoqrnS0VzOPIN/P6tDkAUvh35/99HbsBXc6avjh ++yZL4tF2IT1maKnVBhSusD0co ++-----END PRIVATE KEY----- +diff --git a/src/Symfony/Component/Mime/Tests/_data/create-cert.sh b/src/Symfony/Component/Mime/Tests/_data/create-cert.sh +index 3f36d2f..88f624d 100755 +--- a/src/Symfony/Component/Mime/Tests/_data/create-cert.sh ++++ b/src/Symfony/Component/Mime/Tests/_data/create-cert.sh +@@ -1,28 +1,28 @@ + #!/bin/sh + + openssl genrsa -out ca.key 2048 +-openssl req -x509 -new -nodes -key ca.key -days 1460 -subj '/CN=SymfonyMime CA/O=SymfonyMime/L=Paris/C=FR' -out ca.crt ++openssl req -x509 -new -nodes -key ca.key -days 146000 -subj '/CN=SymfonyMime CA/O=SymfonyMime/L=Paris/C=FR' -out ca.crt + openssl x509 -in ca.crt -clrtrust -out ca.crt + + ## Sign + + openssl genrsa -out sign.key 2048 + openssl req -new -key sign.key -subj '/CN=fabien@symfony.com/O=SymfonyMime/L=Paris/C=FR/emailAddress=fabien@symfony.com' -out sign.csr +-openssl x509 -req -in sign.csr -CA ca.crt -CAkey ca.key -out sign.crt -days 1460 -addtrust emailProtection ++openssl x509 -req -in sign.csr -CA ca.crt -CAkey ca.key -out sign.crt -days 146000 -addtrust emailProtection + openssl x509 -in sign.crt -clrtrust -out sign.crt + + rm sign.csr + + openssl genrsa -out intermediate.key 2048 + openssl req -new -key intermediate.key -subj '/CN=SymfonyMime Intermediate/O=SymfonyMime/L=Paris/C=FR' -out intermediate.csr +-openssl x509 -req -in intermediate.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out intermediate.crt -days 1460 ++openssl x509 -req -in intermediate.csr -CA ca.crt -CAkey ca.key -set_serial 01 -out intermediate.crt -days 146000 + openssl x509 -in intermediate.crt -clrtrust -out intermediate.crt + + rm intermediate.csr + + openssl genrsa -out sign2.key 2048 + openssl req -new -key sign2.key -subj '/CN=SymfonyMime-User2/O=SymfonyMime/L=Paris/C=FR' -out sign2.csr +-openssl x509 -req -in sign2.csr -CA intermediate.crt -CAkey intermediate.key -set_serial 01 -out sign2.crt -days 1460 -addtrust emailProtection ++openssl x509 -req -in sign2.csr -CA intermediate.crt -CAkey intermediate.key -set_serial 01 -out sign2.crt -days 146000 -addtrust emailProtection + openssl x509 -in sign2.crt -clrtrust -out sign2.crt + + rm sign2.csr +@@ -30,7 +30,7 @@ rm sign2.csr + ### Sign with passphrase + openssl genrsa -aes256 -passout pass:symfony-rocks -out sign3.key 2048 + openssl req -new -key sign3.key -passin pass:symfony-rocks -subj '/CN=SymfonyMime-User3/O=SymfonyMime/L=Paris/C=FR' -out sign3.csr +-openssl x509 -req -in sign3.csr -CA ca.crt -CAkey ca.key -out sign3.crt -days 1460 -addtrust emailProtection ++openssl x509 -req -in sign3.csr -CA ca.crt -CAkey ca.key -out sign3.crt -days 146000 -addtrust emailProtection + openssl x509 -in sign3.crt -clrtrust -out sign3.crt + + rm sign3.csr +@@ -39,14 +39,14 @@ rm sign3.csr + + openssl genrsa -out encrypt.key 2048 + openssl req -new -key encrypt.key -subj '/CN=SymfonyMime-User/O=SymfonyMime/L=Paris/C=FR' -out encrypt.csr +-openssl x509 -req -in encrypt.csr -CA ca.crt -CAkey ca.key -CAcreateserial -out encrypt.crt -days 1460 -addtrust emailProtection ++openssl x509 -req -in encrypt.csr -CA ca.crt -CAkey ca.key -CAcreateserial -out encrypt.crt -days 146000 -addtrust emailProtection + openssl x509 -in encrypt.crt -clrtrust -out encrypt.crt + + rm encrypt.csr + + openssl genrsa -out encrypt2.key 2048 + openssl req -new -key encrypt2.key -subj '/CN=SymfonyMime-User2/O=SymfonyMime/L=Paris/C=FR' -out encrypt2.csr +-openssl x509 -req -in encrypt2.csr -CA ca.crt -CAkey ca.key -CAcreateserial -out encrypt2.crt -days 1460 -addtrust emailProtection ++openssl x509 -req -in encrypt2.csr -CA ca.crt -CAkey ca.key -CAcreateserial -out encrypt2.crt -days 146000 -addtrust emailProtection + openssl x509 -in encrypt2.crt -clrtrust -out encrypt2.crt + + rm encrypt2.csr +diff --git a/src/Symfony/Component/Mime/Tests/_data/encrypt.crt b/src/Symfony/Component/Mime/Tests/_data/encrypt.crt +index e8a5a7c..944f830 100644 +--- a/src/Symfony/Component/Mime/Tests/_data/encrypt.crt ++++ b/src/Symfony/Component/Mime/Tests/_data/encrypt.crt +@@ -1,19 +1,19 @@ + -----BEGIN CERTIFICATE----- +-MIIDFjCCAf4CCQDFHjZEW7DHmjANBgkqhkiG9w0BAQUFADBMMRcwFQYDVQQDDA5T +-eW1mb255TWltZSBDQTEUMBIGA1UECgwLU3ltZm9ueU1pbWUxDjAMBgNVBAcMBVBh +-cmlzMQswCQYDVQQGEwJGUjAeFw0xOTA0MTkxNDIwMTdaFw0yMzA0MTgxNDIwMTda +-ME4xGTAXBgNVBAMMEFN5bWZvbnlNaW1lLVVzZXIxFDASBgNVBAoMC1N5bWZvbnlN +-aW1lMQ4wDAYDVQQHDAVQYXJpczELMAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3DQEB +-AQUAA4IBDwAwggEKAoIBAQCxnMT1TGmWhBp4K6IKztiplKVsdoYvi8JsflTpBHiw +-/tLB3ikytItSADuqb/aEX/upgpvPQNJWa0Gf7f9yOQ0CekhTsNtP+o7UA9LtGrcI +-lM1szBoaVhjpBgBAyP5OXcK7pOSRmUgp+vD/I9TRdRdzwwoJzvb35gpWGNZJ3WF0 +-k9z4KqjdJDpQ7QBcEwZXVr8z5VnQ3gl8olY0AyN9Dh6B52uejGd1fBHf5v+hAR+5 +-A0AAOOsTCa4kSXU2KaX9fNd0z/oK+GowfYtfrcCCVLaA6rmEGATQ9meGb54VBFVY +-xarMX0ZY+0C3r8a9h8dJ9qxisMWksKLW8mE97/CclNHlAgMBAAEwDQYJKoZIhvcN +-AQEFBQADggEBAAP4r76F+5EF+wgOvDlDU+KYXI4LfAy/yIvI5cDOLh65iAwgSWKX +-HQPBDzPbQoJaTwj4XPwc4Ygrk7yftgcdYXRm5GWs5pp7DvSfskaX7TSuvNHt0M2A +-gAo/rPH5BXp0/C+zgcmFVL067uhB10YHgsrX1ppLFPOsWvXNGAsKA4Qt2pxquI/g +-UpNoucZ45Y1+idUq99jQr7sXdL3o5o1LLUdI64vrV/y2AYhUGn+NJvz1bXsp5NIV +-jfBaYrAdZ4BMOF6gDMaJekI4PMcoH9sJFr1OIcKnk+UlGir+gAuaQGjKjOKjhB2r +-KpZ7PMSJTC+bJYl3KVoIjBJ9/Bf1yjygb38= ++MIIDIzCCAgsCFG7o/52Ev/AhNXc/NzJdVZ6ennx+MA0GCSqGSIb3DQEBCwUAMEwx ++FzAVBgNVBAMMDlN5bWZvbnlNaW1lIENBMRQwEgYDVQQKDAtTeW1mb255TWltZTEO ++MAwGA1UEBwwFUGFyaXMxCzAJBgNVBAYTAkZSMCAXDTIzMDQxOTA5NDgxNloYDzI0 ++MjMwMTEyMDk0ODE2WjBOMRkwFwYDVQQDDBBTeW1mb255TWltZS1Vc2VyMRQwEgYD ++VQQKDAtTeW1mb255TWltZTEOMAwGA1UEBwwFUGFyaXMxCzAJBgNVBAYTAkZSMIIB ++IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+zdvXAexc+b23aNYqmb1pGJ ++2jYiLIjlU6fXzzgAUPvcsV4hpvuLZaMrcvwK6rARmt+WPiVMrsHxXx+K/pxqxyDk ++MVoRfTTindq0E8K9FZZvPpDCWRXo8FTmThv0Y6z3J91mRjggN1BlPr65QctpZ9tS ++eL14en9/pJTlsWcXoWl4GmteDdvEnHfRrbKl5+m4yevz/p4lpVebaRCrf3vebZO5 ++gkl4AtQIcUtxTPQ4qeKeMLR6cdwEusInxZ1iOTZcqHEYaNh6U9EK529SVGETuImN ++9nXxacocrR1o+4yW/x/GUvDBc4V2ZfMKtHTqeYM5DXcg1lXt4O6bYXa1BSFLlwID ++AQABMA0GCSqGSIb3DQEBCwUAA4IBAQA6wsDtpj7E+uVjDmjHFd20M96LeRM2jA4O ++Gd7OjHiF2LYOmGW+qqj89rh4bZ1YpHJ9IfL6a0w0NJroTSgAeuXyGHz0OKHQKzrl ++1Emhk0d4k8oZvywPmtvpQecIJvf6OfFZwYrJAktUYe5q4xKtRZ+rfage43CGdRcL ++qF/mlzsdePibnPHaEXgw2F14w14kfyRm6caC1rNM63jXi9J5JBayYaHsdp7qMHKT ++sELBjho3duMvGnDZV2etESgA7y3NDlZ1Xs4dmS+9NNEhufWb7SfHxAtdDOSpoODG ++IKIPagSRD8iQZwr4Sde++6QeNJH28rY7oTAVRbSuKaNqjCZIiB6F + -----END CERTIFICATE----- +diff --git a/src/Symfony/Component/Mime/Tests/_data/encrypt.key b/src/Symfony/Component/Mime/Tests/_data/encrypt.key +index b7d1e91..a92a541 100644 +--- a/src/Symfony/Component/Mime/Tests/_data/encrypt.key ++++ b/src/Symfony/Component/Mime/Tests/_data/encrypt.key +@@ -1,27 +1,28 @@ +------BEGIN RSA PRIVATE KEY----- +-MIIEowIBAAKCAQEAsZzE9UxploQaeCuiCs7YqZSlbHaGL4vCbH5U6QR4sP7Swd4p +-MrSLUgA7qm/2hF/7qYKbz0DSVmtBn+3/cjkNAnpIU7DbT/qO1APS7Rq3CJTNbMwa +-GlYY6QYAQMj+Tl3Cu6TkkZlIKfrw/yPU0XUXc8MKCc729+YKVhjWSd1hdJPc+Cqo +-3SQ6UO0AXBMGV1a/M+VZ0N4JfKJWNAMjfQ4egedrnoxndXwR3+b/oQEfuQNAADjr +-EwmuJEl1Niml/XzXdM/6CvhqMH2LX63AglS2gOq5hBgE0PZnhm+eFQRVWMWqzF9G +-WPtAt6/GvYfHSfasYrDFpLCi1vJhPe/wnJTR5QIDAQABAoIBADhp4uVG8AKu0vl4 +-Ym+sY4T5gdGBk/1mFsr/FVkt4mfViHurZMqGLfpNuKXaCiLhmb2tjm+11xk72AxE +-O+670DYJQQ/UDNTKcLNGw6gr5BcFrHnyGhhjYGYjUdFCBgQ+I6wWI8NbPGCZJBLl +-/qLI3joWqQmUgz0aBA50tRuhBWNRS9lNDfoPpibzFNjkxMzb3X3KdbsTfpH7Ocj/ +-bOBuS1mnsm/xh30RzN0w/2yIzpxX4XvGy5eftMLWZY22NkbnDgGbGHDvNR3mjKkZ +-8QF4Urx86VnfTnA6f0m/QS3YXEWk7RxUEGjzwIRv+6FcY+mFEsehWnly2KP3TG3S +-65Z2SgECgYEA6Fe2NdjRbzBCukGa4/fZyrCggQq6Pr448QcyQEenf/X9CulroPtH +-OiiIDuU6mCOBQVHp1FiCtZQT9hTfMszrhy7AMtJQncmQkMcbslEd8JgvDj4Jw64u +-HcnKupNxfVew+at2u+GA4w88ntXxrcNl8Mde7aPnytAyUWPGsbKcCpkCgYEAw7Jy +-yR2KFW0YhIePL1cEzA5J62Yy0yM8MJXHXshy3v1qU9LKsdVk7fbB9UojEnEGcu2R +-T2sW2wQqxIo442KUmStisTtQ8pyAOyQyfzIVRSlHTh4BKlDp8SMuGdnOibavttHK +-q/RgeOiXXG0Yfpf3sKDHSmQv7TGlsI07O6Z0vS0CgYEAgbc+jk+PlgEer/girrXY +-jTYRVhoUIyV2ivKWlpaqqGFAtg/dvBGuEYVBePd3wCrKZhqCbsA/sXqLrm62shkA +-QgfS3EzZH07CfGH9T4/EJGgClXQDZZFgQ9c+bO4WhYEo2CtnbbuXhq0iDheqB3Y4 +-+rWEhS5mIbAc952598mdHrkCgYARF5jm7+mLjYfCq4RaAiOtHuJd6QMvZbhwFeTf +-5moCB+gtgg+qEJVMI201W1BM4ApMJ2u1oAjTAD4sBFaLpaSM7DkmeaPMTNb2U2cF +-rP4mmEBeFkjLxV1pbkUshNWBOa+HLDOjaSiz5ryxmeW1yNgdWS2O1clJ0jhCf1NZ +-FmTD0QKBgGYjCX6vZl+aEchm3Ie18Vp8cNUu9CYAiDiDzEwgxgiTfRCIJywWjv5v +-ll4lqtMgsrDrmI8fBFq4BKytMFvgPqW0sI7U4Fu1vArFeyTwCgfR8VMO7L+qvbWE +-MKKKTeO8aTjTiNJ3b/eIkFDAKU+yQOhVR3VqbduqEeVtxRgzMOIh +------END RSA PRIVATE KEY----- ++-----BEGIN PRIVATE KEY----- ++MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC77N29cB7Fz5vb ++do1iqZvWkYnaNiIsiOVTp9fPOABQ+9yxXiGm+4tloyty/ArqsBGa35Y+JUyuwfFf ++H4r+nGrHIOQxWhF9NOKd2rQTwr0Vlm8+kMJZFejwVOZOG/RjrPcn3WZGOCA3UGU+ ++vrlBy2ln21J4vXh6f3+klOWxZxehaXgaa14N28Scd9GtsqXn6bjJ6/P+niWlV5tp ++EKt/e95tk7mCSXgC1AhxS3FM9Dip4p4wtHpx3AS6wifFnWI5NlyocRho2HpT0Qrn ++b1JUYRO4iY32dfFpyhytHWj7jJb/H8ZS8MFzhXZl8wq0dOp5gzkNdyDWVe3g7pth ++drUFIUuXAgMBAAECggEACIpPhXAWpey1FjiBXQ4nho0fU6sJdeFUHVolBPDJlY9B ++907iKUwzMzpCxjtNZQmoCH7IEtOadDKyJ8gvho9QjEjNYK90LgQnlv7nwiIjz7BX ++e+No7FLXlDHM3u3cTGSsPW6NWvw//Tjfxls1NhfqwWKGkUrNsoYgJI2eZqfbELsT ++PPe/0MgDI4CnDQd+s05ZVzPHtEArE2UZUCS1OL5rfOenVMqd8LNN2z2cVsA3eEuC ++RO+4PuE9A+/Ew4wxZAiVDTiQrRgySg3XJbGhiqq2bPK5VSIvznRtViYio+uDrhzb ++KijOvW4yqzM7Rj8eV2J2b3EvgupRVTuN1AI4vazGIQKBgQD2btBinuc7yBtPix9A ++oVh+lcbJ/tybWz7Y90TeZ1X6QeuMFm9rhl+tWtWycyZaSbM2Gk54aTJdrvfc9I2Z ++2VhMucH+uLjM+uZmNhJBxm7Cit2gwsce7oqCgQ9/h6zIVvO03H2xWJtwj+Vj42RO ++SEDpkxg5G7x0nP0J106dHHjOcQKBgQDDOJI7xHc4Y7jch2G1bj7FOuWCPhzESejo ++gFlkvGE8rOQf3A4S9nWu50nNQpApzKk9s9a08FMiZ2Do2+yap/Tj2tU3K7yYqwyF ++Rg33dXwt92SeKj2Y3Z3/bw7YzSrSf+ZHPW+Ez3Ony/oDZ8tsgH81yTHP2oglnQfL +++ABuyeZOhwKBgFX4PKxbARIi8hwizalPYD7w42OujKmKAHfSc20fIahnfNPnM8GQ ++JCqm6KwTbcrLsUBrlvp8wHxcQM4NZqTIZPyHRT0mlhm0YdJAhMf7gMJPjZe6u5p3 ++30w91/lGjKlrZCOxVAwdfESdfooFVwXUQQj7LtUlbu5DoibfvOYke6SRAoGAFKbm ++aWY2SoPaKZI01vGruEerweR6PJWpCveQ/WQkUTvlAi3QW1cxSehz2UACajmZacqd ++mxSVZt1S1i91z0KXWIds6OI6mFf4Ah1QGu6VzXMPdN/5FjPTpBMGmg7SSeR34u9v ++3bfof0bH0xZm4bqSOolnOJrgrkH3ci9xNEctkv8CgYEAp2wmtxt9osC44r/XDIF9 ++yZsYhmDmSQN2lYx0Xz7Dqvqi71dR2zc42ezfnS4PfYRJZTBjftVWuMOc1WNWA7Q6 ++52VVFZ71mNvEFMI7ogIrVt2boElxv9/2Kw3ON1t+xoQVUEOAgD0Q9LkzxC7WCLoc ++zQIqZfGiVOa4vzuLLGzkrNk= ++-----END PRIVATE KEY----- +diff --git a/src/Symfony/Component/Mime/Tests/_data/encrypt2.crt b/src/Symfony/Component/Mime/Tests/_data/encrypt2.crt +index d3ba774..d10503e 100644 +--- a/src/Symfony/Component/Mime/Tests/_data/encrypt2.crt ++++ b/src/Symfony/Component/Mime/Tests/_data/encrypt2.crt +@@ -1,19 +1,19 @@ + -----BEGIN CERTIFICATE----- +-MIIDFzCCAf8CCQDFHjZEW7DHmzANBgkqhkiG9w0BAQUFADBMMRcwFQYDVQQDDA5T +-eW1mb255TWltZSBDQTEUMBIGA1UECgwLU3ltZm9ueU1pbWUxDjAMBgNVBAcMBVBh +-cmlzMQswCQYDVQQGEwJGUjAeFw0xOTA0MTkxNDIwMjFaFw0yMzA0MTgxNDIwMjFa +-ME8xGjAYBgNVBAMMEVN5bWZvbnlNaW1lLVVzZXIyMRQwEgYDVQQKDAtTeW1mb255 +-TWltZTEOMAwGA1UEBwwFUGFyaXMxCzAJBgNVBAYTAkZSMIIBIjANBgkqhkiG9w0B +-AQEFAAOCAQ8AMIIBCgKCAQEAvGX70bC9IIjPKIGN3FKR3wNHD5UdXhgEWpMDuQeA +-gZ01LRc+tTactRMsuI3lTXCGOmU+kXpT03GcUEB4sP4ykSw04umDn8UbZ0o9WfzW +-8c2Es3iYY/sDr4f7KUMaGqrARZrA9mJM4jvT49lOVWoiyzZ2Jgx2gDtFyCEW1b+0 +-Hqnx4zjhBlCfe6XLpGgEtMwZ9tcmV96BBmlNVNHJbjiSqrsE97FTxxXzQgAmYDRc +-qVAZicNcoNlDo/nV9A0n5ygA2Mgx6LF0HUAjf9YRXvRQ4BARtDJV9q/dzu5zxolS +-mZOWxdlaCkTbeITGmRJNRl6BJiQu5kFRmzTO/Egt6bd5DwIDAQABMA0GCSqGSIb3 +-DQEBBQUAA4IBAQAO6gTF27+s2CaCFE9VOHsqr/+9Rj3jYXefPD1NR4VU7fARXOGA +-dgXW4PhNs2yfgBG2YJwK0uHRsLLwosh6KXZeyBm5XGT8QnzGVj/pZFJKuY0iIK9y +-v4liJkLRKfUNPNEW214c3wcgd7chSOM6eV8rJFtnNyju4LnfnnNGFT2w48rccAyU +-ZsL3BsQ40b/RUqBB12rNoKRyzmLVhdkTU/gTPYAVz9VQqtGXmYrqYQNuyenOYWV9 +-ttQHUD7jszGNtyjNKMmo422QMZzTx38YJ+aR5PfW/arkW3RJPpSn5ClbnH1TSmCd +-oFHODRxroV7eu+L2fQMmHtcbXKCTWg7lfvgW ++MIIDJDCCAgwCFAGm7Gg8Q498XCYUG4+tlbRtb+ODMA0GCSqGSIb3DQEBCwUAMEwx ++FzAVBgNVBAMMDlN5bWZvbnlNaW1lIENBMRQwEgYDVQQKDAtTeW1mb255TWltZTEO ++MAwGA1UEBwwFUGFyaXMxCzAJBgNVBAYTAkZSMCAXDTIzMDQxOTA5NDgxNloYDzI0 ++MjMwMTEyMDk0ODE2WjBPMRowGAYDVQQDDBFTeW1mb255TWltZS1Vc2VyMjEUMBIG ++A1UECgwLU3ltZm9ueU1pbWUxDjAMBgNVBAcMBVBhcmlzMQswCQYDVQQGEwJGUjCC ++ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwgxNn04qsgrdAb+y91qBEx ++9pexRgU+NiG18UkQz3qMQngs0GUCe1kW18GG1HkhrGY4yvJikRcQ5kAR0FoutnxM ++QpvbkDdfs2fRl5rcvfslsY2SBwtVM63I5i2Nnxr+pIgqy2G7rjULOO+9kVuqKBbB ++o/lPQ7/XTNE6I8FJ2r9NIljcdRFIhN+MCMzX3K7yORcTQfW12gTtIdn3YE2oblmm ++CMXrXgSXNhxIWonH6p3PCxG2UlH2DVluOgl8SdkD7Uzl8xPlvFIFqeQlsrYTxmQ8 ++R02TfLY9EOfl8koz98WLOlH5OCqnHWBjpjj7Mwgn2p7QTP6xP8+MxyuJSll+jo0C ++AwEAATANBgkqhkiG9w0BAQsFAAOCAQEAnC69xmv2uuk7tBajs5F8DjYP4fiXE3Ln ++cduCfyCPvZ3ETySPA6zJ1GE4cj7r8T6B39dDqSskKfdN1tP4KOrnXMm7MllDBOsR ++hpU8X37uwt0Ap6gQKVwk10UsrLZrMv0l92y0YxMyK/VsbvrBqH1v5rIJ+R/H9ZH4 ++0Ge4BNgZBXLi+PVbhi4IbIOXX/rvohniXVYIAnjvi4Px6purzYidZSjsTMUwq5Om ++04EnOzJ79hQ55+sqZNhLlLVffdM04CoUupmZxTM9swHD+00Faoy9umU8861ViVho ++dS7O0QpENR06V7MpeUPoVHRO38JCR7w5CCGUuaV8FfsEsK8JeDJUng== + -----END CERTIFICATE----- +diff --git a/src/Symfony/Component/Mime/Tests/_data/encrypt2.key b/src/Symfony/Component/Mime/Tests/_data/encrypt2.key +index 2f58e19..4465081 100644 +--- a/src/Symfony/Component/Mime/Tests/_data/encrypt2.key ++++ b/src/Symfony/Component/Mime/Tests/_data/encrypt2.key +@@ -1,27 +1,28 @@ +------BEGIN RSA PRIVATE KEY----- +-MIIEowIBAAKCAQEAvGX70bC9IIjPKIGN3FKR3wNHD5UdXhgEWpMDuQeAgZ01LRc+ +-tTactRMsuI3lTXCGOmU+kXpT03GcUEB4sP4ykSw04umDn8UbZ0o9WfzW8c2Es3iY +-Y/sDr4f7KUMaGqrARZrA9mJM4jvT49lOVWoiyzZ2Jgx2gDtFyCEW1b+0Hqnx4zjh +-BlCfe6XLpGgEtMwZ9tcmV96BBmlNVNHJbjiSqrsE97FTxxXzQgAmYDRcqVAZicNc +-oNlDo/nV9A0n5ygA2Mgx6LF0HUAjf9YRXvRQ4BARtDJV9q/dzu5zxolSmZOWxdla +-CkTbeITGmRJNRl6BJiQu5kFRmzTO/Egt6bd5DwIDAQABAoIBACtOojFUmFUXPc+I +-4GxKCsAiB768P1D24mFTtCJfaBnjYmroEgEj+afiLYCLFa/UcvaPeW+FmCldz1nf +-SB8ff85BRDL5DMm4TJFUzn+WEG7rGFsNGLK66+D4uDKG+0QwBhy58ytv8056BD43 +-ILuftznRXh1m9gKKHYNgn9goxiXZ816WYgtNDyYw8kgb9v79VKQRqePW60ZcgquD +-THmJWz3eO1Ewurbr4PfrhDtCUcHzz0GRDY0QATCUrAfyl4YbzHrsjnxy4fRq4dXb +-01eYZjoD4wchbWOrIMV72urF/KGWYljwOQjwgRgY9q54VrM/Rgga6jj4gWNXLPwn +-LN1+/AECgYEA9mnNjNMxAn5sOJkhN430DAv/MSheu0yrNsY3iMjrLJcoVpTxvmos +-NxpjWETZFA0T4Yae1VtQjn3LGo1PWJ7j7bCyYdwxuVMHYjCTB107xYg977pMBa37 +-6yoN9aZ97p/FeFrOmIoRCO1Xlyu32nhMVBtVCw8TRCks0VuE1gJ84gECgYEAw7pe +-7iUaPFzPHzxQc53BcWNEnKSvsNYbiEHLad+kbH76VeVWyf8M6ZSdVE38h7wawYfN +-UXPmB2+7ESvvWnXV8zKJCRPMt9ytzH7UxJVCPepvTO8rWPLldUJS3a7sbB9pFFGc +-WkPvnKGsnqf6mtj7IO/O4SluR7M9qosg0lxQOw8CgYBzOeqKrb8/QUrt9H1Z8yFp +-+LoujIgv4Zw2kt4pMnr2cQDF7ARXXGKsqcRG5Hr2K19emIrxji/PUfeFxQqTkElZ +-PsVLiaIe3TqYqco3KVvn9NuxnFYsWb1xrEq20lIVIdU/gIcXQYjRudq5sBHbMWHP +-+q/76eLCftacV8V4JdWsAQKBgHYOsjfetUZ3jI8AqF40Z3vnLnl1dGurmYvEc9d2 +-iAzRQloRLRpF9xnlBEjXiVyt/02Ahj19NOCDakhfQc5EiTpZ3wJUqQS13TcdwWSZ +-ywzhnSTAllrel7z0tlr0qbJF9/HDkBV6KMtHUYGZPLWt7zvcqeJyRQyGdsmphbCc +-8d/NAoGBAJ1ahF7h9ezHs60EJ3AxDoA3SHfv9DM5lyz4Kahr7gxBeENkdD6vP+JC +-E5LVlen6SgdNg2LDY6rcYm8uHT8Agf234FcTiq4IbiKuRu/QbdPXjN/LrXPFmjgw +-hPaPjrm2jSDBdaHlO/wFUq2Oo8hSlWrqHiUCTLg/TfkGegYL+RUc +------END RSA PRIVATE KEY----- ++-----BEGIN PRIVATE KEY----- ++MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCsIMTZ9OKrIK3Q ++G/svdagRMfaXsUYFPjYhtfFJEM96jEJ4LNBlAntZFtfBhtR5IaxmOMryYpEXEOZA ++EdBaLrZ8TEKb25A3X7Nn0Zea3L37JbGNkgcLVTOtyOYtjZ8a/qSIKsthu641Czjv ++vZFbqigWwaP5T0O/10zROiPBSdq/TSJY3HURSITfjAjM19yu8jkXE0H1tdoE7SHZ ++92BNqG5ZpgjF614ElzYcSFqJx+qdzwsRtlJR9g1ZbjoJfEnZA+1M5fMT5bxSBank ++JbK2E8ZkPEdNk3y2PRDn5fJKM/fFizpR+Tgqpx1gY6Y4+zMIJ9qe0Ez+sT/PjMcr ++iUpZfo6NAgMBAAECggEADim6GNcKCZusQZnzzqFnPVb3m961zLukN5zhaCoucD53 ++P60sTotoO9nh0eY2uGrZZSXaKRyMJLI6x93PX4RFdq/NsUZdNPk2aV35FACCz1X4 ++KJZx5vBRSsTjj679/voh7qRazMVlHa85NZzLB5hWKR0w0VRA1lmwU+ztQTvC+IeN ++FtVWd1wL40jFlfzJTYH5Q9+yBgqReJ4qiHDesFtm8/grI9qIFoFx0pzsi9CVTOOd ++Ex7R8a1IP5A4NlZans5wfz94Strdm0EiAYjGcxZt3P8ilnwEDPfVe33+k4GKauOr ++W17EmZAwOcjkfUlBxsrT3nU+1yCq/WbEbkHItfM60QKBgQDAx9wZWbOIT1tYksKf ++yiMGwT+LoV42oMrh73Bw/6zz58YLuPeyf754PtWTboDEAVF+mmLgx+hmIRPrvSi9 ++VG+jUtZTh/JJjMwsO+OZZnIBLCYCbFtRW/60xLcTWPzp323y1HzjfhbrOpetxcoW ++M0qB3A5m3zPb+4vo9RMJRuEfhQKBgQDkkxf8W4fTIIZ6l+uK4OdGwYu/XKVT6XTG ++YRir+gV6/zKEBCk/FopxSa0FHn/+o9pWSbWFN5TWTBpq2cUhgV85HWgQbEFIXvq3 ++/nrs29mmGpUXD/O2C/EZchW7AUFoOGGtOUKzFTReZOIakydIXLp4SxJaIVEvy0ei ++j7OdcdltaQKBgQCmz0lAFkIm/KPJ7JPDuCC+w5C8vZDMLC3helINNO7uzeqsUgzi ++w26IlbYwsDlzYMCnj+dnIROS66RVI4SQ7vL6m78g4E1iHxa8X8X9Aow7P3xUNHZ/ ++2951hJH1h9awd8inif3Wy1ABkt2UW8UVmKQr4cIEebZh7zONDCLAsDg0EQKBgHgJ ++a3JC2zyb+yOMfs0rOSnmYK55R/WeR44a1asTHSevt2avDL4t5zyBVZS3pL4kbHge ++M26ndslnpAPzI1xqJYjIEat2Pn50KrTPttyGxHE/yoYXAYTcFpynVhQkH6ZM3bbr ++uER14U+lKTyNhPayg9bCjfu5PXqdBZywXMJVVLrpAoGAYF32k0U+6xgV5xZSfhpx ++1lm5PfPyM4wv/H7RQ779lvz5mQz6v+j9Q1LKSHZOkWgSCKbjKX5bA+GhijN5aAq1 ++8CjhO0CqYdO/jlJl3K+uF4ecJCiSCyF9evZo2Yh2CRnCSODu+M7WN7pMAGDkQmA9 ++kKp0fL5j7Uk+Trn2WxxUIFY= ++-----END PRIVATE KEY----- +diff --git a/src/Symfony/Component/Mime/Tests/_data/intermediate.crt b/src/Symfony/Component/Mime/Tests/_data/intermediate.crt +index cf9c422..909126e 100644 +--- a/src/Symfony/Component/Mime/Tests/_data/intermediate.crt ++++ b/src/Symfony/Component/Mime/Tests/_data/intermediate.crt +@@ -1,19 +1,19 @@ + -----BEGIN CERTIFICATE----- +-MIIDFjCCAf4CAQEwDQYJKoZIhvcNAQEFBQAwTDEXMBUGA1UEAwwOU3ltZm9ueU1p ++MIIDGDCCAgACAQEwDQYJKoZIhvcNAQELBQAwTDEXMBUGA1UEAwwOU3ltZm9ueU1p + bWUgQ0ExFDASBgNVBAoMC1N5bWZvbnlNaW1lMQ4wDAYDVQQHDAVQYXJpczELMAkG +-A1UEBhMCRlIwHhcNMTkwNDE5MTQyMDEzWhcNMjMwNDE4MTQyMDEzWjBWMSEwHwYD +-VQQDDBhTeW1mb255TWltZSBJbnRlcm1lZGlhdGUxFDASBgNVBAoMC1N5bWZvbnlN +-aW1lMQ4wDAYDVQQHDAVQYXJpczELMAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3DQEB +-AQUAA4IBDwAwggEKAoIBAQDMvRxMxQyecc1bTVZeRCSjBTEmHFZQ2Taqmk5UwO2T +-UGsk4nJRnpFHKqSQJgUX8Lj/Y1sjEM+IWrzVAhCPvsAc5x5mU2smylRKzkTCBUkH +-UBrbqRBAHVeWu0W58E6D6zo6kweGD7fX+gtMeJY/pcib9tlGPUaVST1TaXYbZD8f +-dWD3cN+32FAUyH+TgCtOwYAcwpQ+Npe8X1P/JHIixZz9Eb2WvtiyYqnEDLhKdS9b +-zrUZsknkxUguMdd3n3kOO8scd6PTI8k699hOewtDkR7LPDelxhhIazo3kClQV24f +-Dd6ktX8L/sGCG7+YTTRpKB47fdEVtiZjLlyZ0K8ih8BZAgMBAAEwDQYJKoZIhvcN +-AQEFBQADggEBAIn7oIEeFGCeAUto5PHv3/hHTqLMZZI+VgSxC7zCKBkH59S+ua/s +-8HUPRVbBk8qtApz0kL+p4LeUr0mQIQUXSKeyvp6jplMnrgZ1NXck1D9x14oBesiS +-q8aVEfwH2DsyJi/0UE4boIeSlk9I0Jh1JSN2jX+zSF0RYYPrTOJKqBfu3QgLgt9s +-PbsgOAcHhmWdwDRdFyu/Ok0pieqcHM3TMOV1DPU1aXKtzkCMOHHWfR2bXnIuw1aT +-7koX52/3nq9xQ/17ly7iiZAgTWXC9mlnbgO/izWb2WdXHoLkFPrl8IPi3Enf+lo5 +-xbpVMU82bgYtgM/Sm2RYV0vUZ9kp50SYy4M= ++A1UEBhMCRlIwIBcNMjMwNDE5MDk0ODE1WhgPMjQyMzAxMTIwOTQ4MTVaMFYxITAf ++BgNVBAMMGFN5bWZvbnlNaW1lIEludGVybWVkaWF0ZTEUMBIGA1UECgwLU3ltZm9u ++eU1pbWUxDjAMBgNVBAcMBVBhcmlzMQswCQYDVQQGEwJGUjCCASIwDQYJKoZIhvcN ++AQEBBQADggEPADCCAQoCggEBAKYX16pMjcBAim1muNycE0K1+2VEhZF7PrBraS59 ++Dcldrkw3qxAgLg7XoBYB9jIB4cFZ99WT8BVdZc+1vOrq6QaoaBmbr85/qwYeUB1E ++RQMarNy+XlWrwxGWM4Heb2XkCz4sdi1PshObOzVfVHvxn3wmTcQL6rZ2pxbImPgc ++rvGVgDijjVhwu5dCH7asdlUx5HxB8jtFXBEIuYE5VW5pyPHsfSKzRO7jASEekNND ++B4RuCrtoq4afNQvifWnUDC8Xo6n4hw8VbxTJau+amoo8qiM9Ao1uCvRAMUW3znhP ++C0NRzYzj9sjt58xwcLkoQHLls5XGUPII+t9leryIzPzeCxECAwEAATANBgkqhkiG ++9w0BAQsFAAOCAQEAV1WIKWqF1Uge0sRnc3Ku2pL6+BUNn5CgjuYXy8XUUPwXwHqd ++zYOL7gwnOXPBNriJiJ4rTNb/ClIWt7gUGitHSFyLsP+jH3IvNDmlEpxy5KtWU+ej ++DzX4RUxqoayAwQ0KqU0HtQnoEA54X55+9HZqm6uOriuCYxNZ+qqSw+8fM8w1ClWy ++OtjifRco0nk4HTaaOS3qsH+jnSiaC/9ZI3kjRVRvraZMvYyZDaCHqdde7lutSP8s +++HRLtsnpZnYsj7kYCq/ejVEw39Q92KO17gW/EGC9Inu8/KjlVeFPXafUje7YmD6Q ++kSLozmlQH3NEpX5mj8045imTX3vra3L/9Mky0g== + -----END CERTIFICATE----- +diff --git a/src/Symfony/Component/Mime/Tests/_data/intermediate.key b/src/Symfony/Component/Mime/Tests/_data/intermediate.key +index b622a6b..86dadeb 100644 +--- a/src/Symfony/Component/Mime/Tests/_data/intermediate.key ++++ b/src/Symfony/Component/Mime/Tests/_data/intermediate.key +@@ -1,27 +1,28 @@ +------BEGIN RSA PRIVATE KEY----- +-MIIEpQIBAAKCAQEAzL0cTMUMnnHNW01WXkQkowUxJhxWUNk2qppOVMDtk1BrJOJy +-UZ6RRyqkkCYFF/C4/2NbIxDPiFq81QIQj77AHOceZlNrJspUSs5EwgVJB1Aa26kQ +-QB1XlrtFufBOg+s6OpMHhg+31/oLTHiWP6XIm/bZRj1GlUk9U2l2G2Q/H3Vg93Df +-t9hQFMh/k4ArTsGAHMKUPjaXvF9T/yRyIsWc/RG9lr7YsmKpxAy4SnUvW861GbJJ +-5MVILjHXd595DjvLHHej0yPJOvfYTnsLQ5Eeyzw3pcYYSGs6N5ApUFduHw3epLV/ +-C/7Bghu/mE00aSgeO33RFbYmYy5cmdCvIofAWQIDAQABAoIBAQDMIfWYeZOWWsM0 +-uExX2rtoquGRLQnGvHwr54QYLu/xRGo/sWPoCyCwg0zmyHGlqAbb4/VXZgh13HqQ +-KunWWIr1hl6iCaQ5XdxjZXvasyhYGT9eKhegxWCyUfA4bufp0dwR0MzclslnltAz +-I7wyo5n8H0gNJ0U7zXVOuEThFLd3JWg2oJLfnjgWYi1sq0sA3VTKX2L4iwY+vnlN +-d/i4Q09jorR38YZzEFjirc6YgOYHmEa8rx5oAZxEViRyAS/yvPTfvxB6HwxYbF4e +-EB95VHNft490diDm0RHO8vaw4G8jpP7r8ObXiqwAoKxb8+AHNy765DmbyXp89eFU +-SSRNYgQxAoGBAPjTYiq3jU1ykyyhci/y+T1ix+Jhjy/5WKbogKYalEDFbErEChM7 +-zMjQNo92Vl4CgN+CpcY/SBVIZozbsT2nJWCN8FaQnZjNK4BlndN30bCp+Mu3sBDl +-jZaOdm4Svif9kXPooG7wTcxadvGb+pRNy8zmZCWej1y9/13/FQdh+L1dAoGBANKk +-UJ0wJf8F4jR5PC2Db9JlluVHfPP39d1eGGS/FzfbSbmRZImU2eZI1ItWE0whYF06 +-WMULqzdRLdcft/SHux8d832ZyHLqc5t4Xip5QE+XEk26S2ZCcjoOd2Ez4NIN5YNm +-veac9udX7oiVX8cKn3zGxyrEHLjIB+XW5Yq+KeMtAoGAEQkv9GrCwuWwS+L11XCW +-PeywcMBrNEanGi5a+IRjWBfsNSY85lo2yBzxT1szyJX1SthAD1Wv0r01QDmeZfE2 +-ruio5tRZ5edOLilG5/6RHb5VaWU3KcD9s6wnUZv45vYGamAn89CCExayhBJA0ryM +-0oeHncfAWwIrJL1dLDc594UCgYEAuSahjWlzHJUJXmJqWP89XUzatDKATNpaDPjW +-rEejmv9v8GMyYhSq69Z8rPU+BR8ZWxkcSieVmgwLJRrGUXS1MAbdrjtsjEY01CWb +-b+4gb1U1S4lDGWGykgGBQbmeFkUMxtGafojeJj+OdhQGmihmRAFds+Op82owNwEL +-x0ab/wkCgYEAuCJQiyRzO/X/jq6CdaClDhCiMW6z5JZced6VZS+6s7aA5vmhcl8f +-TAZp7BeHqGscPHfpzY6P7lZmqQL2OWURFFjgJYbRWZtXOYGH8ZhBsGA3uAIwyses +-2XxUbSYZ5jNvp7r3GwqIsFFth4QRtGEBMdUgCS2mZkRsW6A5NXmeiKA= +------END RSA PRIVATE KEY----- ++-----BEGIN PRIVATE KEY----- ++MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCmF9eqTI3AQIpt ++ZrjcnBNCtftlRIWRez6wa2kufQ3JXa5MN6sQIC4O16AWAfYyAeHBWffVk/AVXWXP ++tbzq6ukGqGgZm6/Of6sGHlAdREUDGqzcvl5Vq8MRljOB3m9l5As+LHYtT7ITmzs1 ++X1R78Z98Jk3EC+q2dqcWyJj4HK7xlYA4o41YcLuXQh+2rHZVMeR8QfI7RVwRCLmB ++OVVuacjx7H0is0Tu4wEhHpDTQweEbgq7aKuGnzUL4n1p1AwvF6Op+IcPFW8UyWrv ++mpqKPKojPQKNbgr0QDFFt854TwtDUc2M4/bI7efMcHC5KEBy5bOVxlDyCPrfZXq8 ++iMz83gsRAgMBAAECggEAINY6YlYXuUBZTcc++YiWyzvYy5zYLlq4Gl9l8FWzbdHq ++VXG1DW9bQ75wDSHOp3TVSelsVMqWbtbj+8RxqN0P/Gu7hwKPZ6s4Z/GCw8J9RV+W +++N5fHp9iZb31CXItQm7rJRvbsloc+gDY3BSwin+K2RvmiIGVogTDxH6ctYLQOH0V ++TXq36cGxtpJ3ttWldyn0dRoweKVBKRt/XfH1hWN7E6UALLGGLzaT8hRdt+sLlI3R ++HHmtUJpqjl61WhcmXh5HG4DmO9Q2QiqalkZ5wLSaODq8WUEWUdWK1v+tiwnZIVY+ ++B8o9dDXxWy7AOF17MAcDMG+szemyjR3IMWavD51a9QKBgQDLcFQGFuO7o7GNG3iu ++S2yvYKC6VbQRR1Vku/wQv6uIAqh72vQnEboXkzfcwU4qsMQqVBwuPEBuNHWvqmcu ++uplFQJY4do+/TACnTILYjqJintTXO4YBQ6cQoeM6L20NigtCNNhm/PPsN5GAwVsP ++U4XAZ4mcqCeYex5jns9ut5fNFQKBgQDRAW5E391qZwl7NjJtTtxgVRuh/aXsYbsH ++A4o07vn+JmTce2UkFT9p4THmzFlA1IZsJXgcBCF5aLXmLXe2io44XKtpeh7fvAsD ++Sj1aD9PvT44WmpUqjc/ZUUu25sV8nvwte5Mco1TQZx0yZu/AqiBrKY6hk3RSFw6D ++EMPnrAhdDQKBgBe2fSTEkEDz4KM4+4UdZ4q9sZ5mlPmanfqC6uus27qbzLW7HNBd ++AZrz3wQNSCYzunnQmgRNo5j05m7WZvaMa4cl8xybvT+oBT967Jl/brAeIWMBHiqR ++jyyiIhFLK+PzHkLWVA8VFv2GsKAYaZvMuX9m0iR/eTYNy8oC3dzi63/NAoGALVLm ++GsGBPoXBpJqILPQhDjLmnyZmSPCYoli+K+R3CgpBbR7FPCHvcoKHU8mUwV5VGDa3 ++6TtsFuwCJjxN7aP2W3qdIW5+K36X1MrQqysrhoX2BijXmDbQkAv1I2DACtpfTW2y ++5U72IYt65Wc1Ls614QdOCvPzEao2V23XTfIcjjECgYEAnd8+2oYCTDasWIwsHdKE ++H7TxglqVYhoDPzYBLR4FU4bsZ9zrBMSit+Al2pBi60k0B/MJ4SuZ+UY4FpPPCJmq ++SwR3eq3KeXOa+mPMgOIKILlQYitGFlsSYU8/cUp1jka/B6WOuRZUYjGwjHnRasVf ++6d8k7AEDlGwzLvQO4MVwK8I= ++-----END PRIVATE KEY----- +diff --git a/src/Symfony/Component/Mime/Tests/_data/sign.crt b/src/Symfony/Component/Mime/Tests/_data/sign.crt +index 3cdb0cd..3bac073 100644 +--- a/src/Symfony/Component/Mime/Tests/_data/sign.crt ++++ b/src/Symfony/Component/Mime/Tests/_data/sign.crt +@@ -1,20 +1,20 @@ + -----BEGIN CERTIFICATE----- +-MIIDOzCCAiMCCQDFHjZEW7DHnjANBgkqhkiG9w0BAQUFADBMMRcwFQYDVQQDDA5T +-eW1mb255TWltZSBDQTEUMBIGA1UECgwLU3ltZm9ueU1pbWUxDjAMBgNVBAcMBVBh +-cmlzMQswCQYDVQQGEwJGUjAeFw0xOTA1MTIxMjA0MzdaFw0yMzA1MTExMjA0Mzda +-MHMxGzAZBgNVBAMMEmZhYmllbkBzeW1mb255LmNvbTEUMBIGA1UECgwLU3ltZm9u +-eU1pbWUxDjAMBgNVBAcMBVBhcmlzMQswCQYDVQQGEwJGUjEhMB8GCSqGSIb3DQEJ +-ARYSZmFiaWVuQHN5bWZvbnkuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +-CgKCAQEAqCDgfKFvJ1NdE0MmSjiVA6Z8ydmZZBsfAE57q9+2bjepW5qwVmL/Igvz +-hjjeWFiFIDuLhKkBFZmDR22pkGm5yZRQY8DDXB3Oz0qXr3tVwY4/Iiq+AQhSQfPw +-xA11ahRkU14U1CfPc+XdN+Bfv+iwcX8itlz/auHF5BnwFMWcE0A6UC9/70owayia +-rVMEWKuYxHrG89t6p3CgKxBG4gF7uxZhy80qVfJWG5ZcCH57xwD/hgQ0We23H89M +-G4cpYDX8FZfjzeaVEikOJ9/RK3P6pb5EHtfsO42s2G+j6MnrVTTIA9g326VLW3Vf +-3xIrWpGQbwwvm9wiARhEUV+o7QmdXwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB+ +-mQRLFCkuKfq+pPr9a5p5HfxBbVrNveAOEGRsC83aD4vtWT4X2NoE1MkW2n/AgXtv +-AmF/duynnRurKGH8k0Fkw5fMEE+GChwwmJk6UxIV5oO6khk05QAua+5dI2c6rf0z +-xanXQksuQDjynnUKNbwyMGAUBcWPlpBeyUKThNWGyRgVuM/7nihI77Rqm2WGHRac +-RcCoosNXG0othSWzz0hsxuqsPneO0hGAf3UZI/b+gJk9/SJelUvIRStHBoQRB7YZ +-y7kXDwcQZS/IkIGDyWxV1KIpZ0Ban5+0awEG1ShUyepy1dV/24frwu3VOgRN4jv4 +-2CGR71B5H0zIRjazNERL ++MIIDSDCCAjACFHnviuUTH+p8Ox4/II5dP8RfabgDMA0GCSqGSIb3DQEBCwUAMEwx ++FzAVBgNVBAMMDlN5bWZvbnlNaW1lIENBMRQwEgYDVQQKDAtTeW1mb255TWltZTEO ++MAwGA1UEBwwFUGFyaXMxCzAJBgNVBAYTAkZSMCAXDTIzMDQxOTA5NDgxNVoYDzI0 ++MjMwMTEyMDk0ODE1WjBzMRswGQYDVQQDDBJmYWJpZW5Ac3ltZm9ueS5jb20xFDAS ++BgNVBAoMC1N5bWZvbnlNaW1lMQ4wDAYDVQQHDAVQYXJpczELMAkGA1UEBhMCRlIx ++ITAfBgkqhkiG9w0BCQEWEmZhYmllbkBzeW1mb255LmNvbTCCASIwDQYJKoZIhvcN ++AQEBBQADggEPADCCAQoCggEBANc97d5pdVD4VI17re0V4wPpOXq1GaKbHlLaRAzS ++7Snq4qmvzG5SqQHlcTu4tgxOWNhx2UjP/B0n5DWNUdVxpakIlVYhj6mOrUuTG4ky ++R+nf4hc0NB+2lRzFMJxFU+Or+wqEo1UxachP7YCOCYjehIWbSkh/uOuKdmgCM9KR ++l0qSVZaJRJtReFf2EU+FATVmqzIkzJ//s+JhYD34BYAszqH3xp62TEira7Nd5eUg ++aXTphZRaZ8LHi3EfhVpPOYdEMCPJzJIYaD1k3PstaUAyh2arnrvJX6kY5c3mVdvO ++5FSN+uLT/5cVplXKKCz2hCcabNwHYV2asNR3nugo87f49YECAwEAATANBgkqhkiG ++9w0BAQsFAAOCAQEASieUGzFtDxFazCkB0SGziCjRthH96svLH0nUlF5uurycLO+H ++oth62er/RjelqlS6xQNMhK/IQMoWCNW9uPYfvxjgC7k1FZGADkc3VnB3EYE1bcyC ++rKvBl3Ubh2NYtKI4z2rEuWWaCyurhLK7+B50K03y4dXuJ39Q3N6Qk1E+SWhwOWwu ++C8bCSX4HA/cTOfoZvVof1jrKHU6OepW1uaG+8H24NNNf+q7l4YZa92lu3vputbO2 ++UKIaY+YWszVyKsrHleg5Xzt+6B6buLTr8ThuLVlSXiFl9OucmlrwyF/vhyThOk3V ++Fva8dIJK4ukmLM276tEUPx1vDxwIoe1SPgKJrg== + -----END CERTIFICATE----- +diff --git a/src/Symfony/Component/Mime/Tests/_data/sign.key b/src/Symfony/Component/Mime/Tests/_data/sign.key +index 68d1d57..f08067d 100644 +--- a/src/Symfony/Component/Mime/Tests/_data/sign.key ++++ b/src/Symfony/Component/Mime/Tests/_data/sign.key +@@ -1,27 +1,28 @@ +------BEGIN RSA PRIVATE KEY----- +-MIIEpQIBAAKCAQEAqCDgfKFvJ1NdE0MmSjiVA6Z8ydmZZBsfAE57q9+2bjepW5qw +-VmL/IgvzhjjeWFiFIDuLhKkBFZmDR22pkGm5yZRQY8DDXB3Oz0qXr3tVwY4/Iiq+ +-AQhSQfPwxA11ahRkU14U1CfPc+XdN+Bfv+iwcX8itlz/auHF5BnwFMWcE0A6UC9/ +-70owayiarVMEWKuYxHrG89t6p3CgKxBG4gF7uxZhy80qVfJWG5ZcCH57xwD/hgQ0 +-We23H89MG4cpYDX8FZfjzeaVEikOJ9/RK3P6pb5EHtfsO42s2G+j6MnrVTTIA9g3 +-26VLW3Vf3xIrWpGQbwwvm9wiARhEUV+o7QmdXwIDAQABAoIBAQCD/gOfdLGqAwVw +-SOh3noJGcl9HrKCC+dPVzsfCwIgdcW9xLjlAKMo59X4DIwRUAXLKQlUfGfty9Kke +-25YifQ5RljGijsQQvooNLXd2WfKSWVVxQnMWpmzFwHiFwjcqx8WXuaXKhVKVn6GT +-63/gTxKul+wtlUckpwlQMZjNBfKpHR56GWTpvvMiEhssGvt601rRj9Dk+f/nWTJo +-Qp2Ka2O616/2jF/BuDj7nsK5ePvDotHf4dlRsLLHk8hoqpamByQsepLltvGu4p7U +-bAYGOkYJyPtBuLyoYxOBtJrrewUsxo7jEuTfO9j7JHaYqG99QDEWaGlqXGR3481x +-emFDVDnBAoGBANaq6mYCkNb84EaR0OzVdj89b5wcECds3UNvGy/h8fx5X9s1Xal2 +-EVG976nY4r2wEGKnwCb0qhh94BUmFoxF0iPe3dwlLz9H2ymmWu1v36CMKc92f0UM +-3TzeaWrBHdk72PZE8nBTuKkQabboH9LHf2EUrnjNwoY0p9a4uZbLPNi/AoGBAMiA +-BKg59MI6GN/9mp+n9D7jdl6ZqhLfYJFGPADRnRPIS89TKywACVNwYCpC2wBRHJ6W +-F05BQW2U5ohF2w4n4UODwBadQhP1dg/l40ZO5+BL98Dx8g3bwItCTe25bYtAS0wI +-dULj/AR4zdMQCdrh2zzWwPfoNT+6gXfI8V40nsNhAoGBAIvFBw9aVlIUnjZ0lLLP +-nck5SCU9xGrXIA3bFrmLhNKdeIMy8QP4Yvh1Ecnl9GQLce+6R4tVvDZsJu2+Oeol +-P9ipMI05DNVIBPPOY9+6+sD+4e45uk4MPTR3n+2pRbT+mZpnc+8dI9u4WwyDgMzt +-pgtguuTfG+vj9vAAoJ4FQF3jAoGAbmSuK8HdVaOPVqTXodhjzsyGvAd3cPS0wsgc +-+YZwKhg6RWjReGR8vgg9qocs9buzOk4BfwDG+YLme1mbBuxGR1ofRVRIsZyQ6Kf2 +-vxtq6EBrpTyRvbelCAf1yFI0UluQGcj+Z1oHxJ6PFQrbojyA7bqAfP7JctFJv55P +-50Kpt4ECgYEAqjYa3J1YJsK+xTMEG1mAzPZcGG09/Od5Zc7XRY8SkaKwW6eRRu7G +-Eq0RuXLW5wxM32sIJyhNqTSchWcntqV/cwvLDmI+JFg3gJ9fNzEdRyHGccBDe7ad +-bdR/9n23NVBfaLd6lLszFUQW8efmbzI0HQO1USKRTsFm2TkkcHlafts= +------END RSA PRIVATE KEY----- ++-----BEGIN PRIVATE KEY----- ++MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDXPe3eaXVQ+FSN ++e63tFeMD6Tl6tRmimx5S2kQM0u0p6uKpr8xuUqkB5XE7uLYMTljYcdlIz/wdJ+Q1 ++jVHVcaWpCJVWIY+pjq1LkxuJMkfp3+IXNDQftpUcxTCcRVPjq/sKhKNVMWnIT+2A ++jgmI3oSFm0pIf7jrinZoAjPSkZdKklWWiUSbUXhX9hFPhQE1ZqsyJMyf/7PiYWA9 +++AWALM6h98aetkxIq2uzXeXlIGl06YWUWmfCx4txH4VaTzmHRDAjycySGGg9ZNz7 ++LWlAModmq567yV+pGOXN5lXbzuRUjfri0/+XFaZVyigs9oQnGmzcB2FdmrDUd57o ++KPO3+PWBAgMBAAECggEALgFg3wXD60VUzzPVAkSIE/0sybc9LjYBBnz8CBCqW+gG ++P/YhGCCHWq4npHfvw1QYpdS5uFgqHzI4UyDsUZabrbQ1tSXxvrBOBoYAH/Q1Dj5J ++5SNFk9Sy7OYR5Ijl7BcFjqM4hPxNi6DX1v8k9xH2mdcOCs5v4DplYgg8euCfCXM2 ++mQuAGRGG/FEsnTzHbTfGEywjFuagkbBjeWUWwFsV1cA62ZuxJHRs+QREG6j/3Qzo ++jPV9IwfaS+vbZY9p46alf3Hnes/K3rC32FFkS6vszO9gAlK/1JJLWq4iBZNLYhK5 ++IpIvpl1/ZN6OKChHHCO8v7fQMGygvfkXBleA/iXj9QKBgQD5zuzWlZze79odDtX6 ++3YMbaLO5taJexw1tYEW4iOG4imQvqdXPTYcmRztRr34EV85SkehPjv5XnDm48vmA ++WxaqbuMqbklGNwfqDAs2P+BxunDfJh5+dHoR90N+dTBCP7nB155jRB9aJSLiA+fu ++s3g18BUE4mvUcY8q3Tf41mx9JQKBgQDck6yxRB5w/jermYJ2GBXLwl17c4KE7sqD ++Yl317fGZ1bEaWOvcNTmQRpaLYj0R75vW3vjWuZv0ivTTBoclYsHafEfD1OGHTvvv ++1x6kfdaGG1eHZbLO+potfpD0febMtixUiw4YQlQf1m1+yuXQsGFFCSsTood4vcuu ++11XINrg+LQKBgQDnwoSUaOXLJ3eSMetv/Qbf7PmhN9RWXhIlAYZtuADCdxKP7d9B ++nsneR4PPOyOM3/G5RUjkVuO9YGFlJ3c3EEstAAednAg7Ll8XUuksAYM3wCNrxC/S ++XjnKZT6nGg4VyI2MO4Dk05TKy11blwgcu0CxufWmPHKR/HE48Vg2cqjgSQKBgE3F ++V5cswFrwlypOtrvypASypAk54eQC2a5XSW/DlHK78HSss4Rx07j12nCMk6G2TMkG ++1s/Go6EmOUoKPC5HUrg5J4h5j4cIpzWaMHio0bF5BHR9u/zUSPYPcQZzOaQl+x1X ++5gFRqZ2MGhEhcsQQ3Erd/60tmfxNVvpvfBRajr2FAoGAFsd5mwyF1ERyE2MX5M8u ++FiMkMayi5qMgL5QiSi/Bj6xd8LuY63ToP/Ieuhj4D0E5sA7FdlwAb0Jicb7V+qYk ++UCcSBFAgWQjLNcGlcHSUKNmIK4HqZCDVgTEVdgF2CODETeX10LUyApI127xfQ8mN ++WG+PNll+wd6xemltZsVscaQ= ++-----END PRIVATE KEY----- +diff --git a/src/Symfony/Component/Mime/Tests/_data/sign2.crt b/src/Symfony/Component/Mime/Tests/_data/sign2.crt +index c107dfd..01331ef 100644 +--- a/src/Symfony/Component/Mime/Tests/_data/sign2.crt ++++ b/src/Symfony/Component/Mime/Tests/_data/sign2.crt +@@ -1,19 +1,19 @@ + -----BEGIN CERTIFICATE----- +-MIIDGTCCAgECAQEwDQYJKoZIhvcNAQEFBQAwVjEhMB8GA1UEAwwYU3ltZm9ueU1p ++MIIDGzCCAgMCAQEwDQYJKoZIhvcNAQELBQAwVjEhMB8GA1UEAwwYU3ltZm9ueU1p + bWUgSW50ZXJtZWRpYXRlMRQwEgYDVQQKDAtTeW1mb255TWltZTEOMAwGA1UEBwwF +-UGFyaXMxCzAJBgNVBAYTAkZSMB4XDTE5MDQxOTE0MjAxNloXDTIzMDQxODE0MjAx +-NlowTzEaMBgGA1UEAwwRU3ltZm9ueU1pbWUtVXNlcjIxFDASBgNVBAoMC1N5bWZv +-bnlNaW1lMQ4wDAYDVQQHDAVQYXJpczELMAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3 +-DQEBAQUAA4IBDwAwggEKAoIBAQCuXCpZPt3ikKzhKePg4ra9ynLMyaRZI1PLHJ9G +-01XjAJhz1w1yRk7N+AhtEHQK86UwAQLHTOt6XZU62Ifh2yWWkuhDCnO7leQFtJnr +-GAzuvXwUfK/Fa+gqmhf0HU5QAnSMmH7w3ViprT2YyoP9aa4G5sD8/DoHBejV4oCE +-QFevUuaeKov9rWo81pkREBM8CVkghFIdbbj/gegAmmK2SApkvATx7JCWh3oPtSJ8 +-CCuPwLtE9aDfdT7LyuI8x+O8MHVeFB3LvBTOlzPPs43/N8RU7WX1/VTpREIyWC7J +-I2bF8V6qLdYknYWm8VMlBlCWj73SuZreUWYesxUFmLrRgLeZAgMBAAEwDQYJKoZI +-hvcNAQEFBQADggEBAFQlQzsZfdZ8Z5uZVRM2JG7Ga70cBMd/wS9J/We1ECujgGJD +-+smJCONNHmobZswy3EoMaHlUDvUA35gTvEkA+XMXItEfJLPY75j9zRdOZWYI0Y+G +-XWt4Bhrh7Dswtci8NUs8TPqJlmLMYJFFEbnxdZr+o2/KIkdVoCjpXM7fa4GLBnD3 +-aM59/yclNFCghxGhCYF+nEOoIIet35lxsTC3Pmo/5nDI9fOgjt6yYeiWOM7eHIOJ +-G37mWWFODhLnzlA6uRPCjkMzRZnJYiSx7/kJkxqsPJVzIH3vCgHzRnt7JYoKCxqE +-nvM0FdQ9+HG4VKggElSdVbKAgt8XjGHeSmVPd+M= ++UGFyaXMxCzAJBgNVBAYTAkZSMCAXDTIzMDQxOTA5NDgxNVoYDzI0MjMwMTEyMDk0 ++ODE1WjBPMRowGAYDVQQDDBFTeW1mb255TWltZS1Vc2VyMjEUMBIGA1UECgwLU3lt ++Zm9ueU1pbWUxDjAMBgNVBAcMBVBhcmlzMQswCQYDVQQGEwJGUjCCASIwDQYJKoZI ++hvcNAQEBBQADggEPADCCAQoCggEBAJZhhv44b+rI0c475iC8d1dWKQUZVMDRjskm ++Sd+4hNY1FBniFG21KXHk6tDvoua3fvgP4jtJS6V3BX4i7RaD6XnmlVRcyNR7QUeS ++2ERJT1zgHbe9F0CmXHAEimVuJ7O87a6JdrR7xpfef5myX8QoT0hX2KoUtGxXkZ5j ++I8QC/UrpqN8epGIoloaYfIkhcoEbwGsv/rWoeIZFNI0pc6WiDZ7OO93QxeTcYpgt ++SvS/P9wYIxKalZKfiiiBA2QDEgLPrJ4unJ4M2ldMir/sVmwhkuo9v6rth9+2H01W ++XKcNGhGocrH+PUsa9fxDhlv83jNJRC57BNjDu5PHDdY2iy7dk/kCAwEAATANBgkq ++hkiG9w0BAQsFAAOCAQEAHfqwJnscg7AA0clD5j/FL2K6HiiFSbLVjxUQYEXn4iwa ++Tdd6qxCy8xNnqGkF7p3Sht/dUdmC77zggg6KNg6FqLTFthootaIjebj9RblPLUz5 ++z3CixDSg/Hge+TFkXgZEr3pVIQpF+kmiFgYXG8f7Iu/M9gR90lfZt3QA6W4kNl0d ++YQZgHxDS+ZmNVEdAPiSKcu73UpE37N6piTE352UhVr0Mv1fQLpR96JSqhEJ+7knP ++DRwMUyNjrzZdNgV9WunaoG0oAw4OU5CTzjVfMgBxXD/6bi9C8e8oJgr4YX4T/qmH ++94AqO4DAPuFJ9q6wm4tr2MC/Uvd0/ZK2h56myTvA+A== + -----END CERTIFICATE----- +diff --git a/src/Symfony/Component/Mime/Tests/_data/sign2.key b/src/Symfony/Component/Mime/Tests/_data/sign2.key +index ae4ffcb..3a3222b 100644 +--- a/src/Symfony/Component/Mime/Tests/_data/sign2.key ++++ b/src/Symfony/Component/Mime/Tests/_data/sign2.key +@@ -1,27 +1,28 @@ +------BEGIN RSA PRIVATE KEY----- +-MIIEogIBAAKCAQEArlwqWT7d4pCs4Snj4OK2vcpyzMmkWSNTyxyfRtNV4wCYc9cN +-ckZOzfgIbRB0CvOlMAECx0zrel2VOtiH4dsllpLoQwpzu5XkBbSZ6xgM7r18FHyv +-xWvoKpoX9B1OUAJ0jJh+8N1Yqa09mMqD/WmuBubA/Pw6BwXo1eKAhEBXr1LmniqL +-/a1qPNaZERATPAlZIIRSHW24/4HoAJpitkgKZLwE8eyQlod6D7UifAgrj8C7RPWg +-33U+y8riPMfjvDB1XhQdy7wUzpczz7ON/zfEVO1l9f1U6URCMlguySNmxfFeqi3W +-JJ2FpvFTJQZQlo+90rma3lFmHrMVBZi60YC3mQIDAQABAoIBAGL4/Cz2q5rdBtU1 +-Ix5XcuXe0jV+zGSw0fK8h4j7k4gsoV04GHDiif8OqTHHoidJUF4kZMBe4FfwYTIr +-EU7aR8bmEyNi/njfx7SZZLl3SHgIZTN354qICxyLpcczD24JRsE8Gup8qsR+CzX8 +-1tl1MIzIVYoFXqb36sfmL49iuqNQ2qyrH+OnDKHhBYPrHt8FuhZ1XYyRhtqgjJAD +-YMYE6+vA4gwN4Ajk/a9XE05awQTUiLcaXtMxVGB1fejK3xnN/HGOFR8xH5Qi0aSf +-vMaJ7rh4fwYjRPQTBVPnm8HA7CVf0dyoCBjK63OJvd+RVj3w4t4/3BeV9VsDVRiT +-PFEoJwECgYEA1RZcMkz+Os67e3Ot9NOFReup2PmFhh6PvrqJd0oAlTc/+f6fUI6G +-INJNhuCCVg96cw76gfvdN4a3EPgyV708Y16m4EhHpu7jMtGprnbX3Y5H8NjGs62n +-ziKw6sCa25xdXFV2c0M0uQVUJAk7sWxpDU3OWkxpmMRPdhbawEdKVyECgYEA0Xk7 +-exS2+SRkrveMM2jj6dVZLQ00Tj0WQOovKloUXp9K8ACzXVdgcMeBSQhzQFN1SwAZ +-EdEvR9c6dizRHTnfXK+sSMURjMw0e9Fca9vs43oYOW0bIzAzpRJrkh2ZlwDlDuZ0 +-ST25nUpCKn7s6eq3XIIs0vNuJNaW2KKIoHqBaXkCgYAHdxkTyg6+ELAQyyS1BxQM +-Nw1kRJmg8UEn9XELdNRAZgcfwwPh1pxsWfHNX+AxE6m+ji/IjgJaB6YyOf/Jgx+y +-e4ZtJRsdhhD/nsjLC+7UHD/4+B89/D98wUphbw3906SRr4zOzPPz53PjL0+gD6Q+ +-ixNHppWsfHQsNvDC+7xnAQKBgHWMi7V5HWjYZGvPXOzomqV45S8j7stM+nT5NfiV +-TkL/LwVZz029H9CKFGIQjOR3MSYiau8VrWuqOxNf+QVmmZKgvpSjikKxwW4OQcgB +-RYEt3fQz5vurLAAhQx5e3/beOKxQ5MbJDaVXq6O/UGHAJp+SKWdD1fZ0OXheVT+B +-H6g5AoGAZBjDmmAca4SMT5nC4Ueh6PlYt0Yr4pMTdkrYTkGxzak6VnRlGg8rmiCP +-LSO9vaCoriMSouhVKdBdTjD6lwYxxt4O2HY8D3RgqvU8T7uiI58l2XVdCbs0cBGE +-IlNC0CjIiHPWuVhCQk5eLk4WLDvbLq6Oc+8J4BOFupvq3KrGKik= +------END RSA PRIVATE KEY----- ++-----BEGIN PRIVATE KEY----- ++MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCWYYb+OG/qyNHO ++O+YgvHdXVikFGVTA0Y7JJknfuITWNRQZ4hRttSlx5OrQ76Lmt374D+I7SUuldwV+ ++Iu0Wg+l55pVUXMjUe0FHkthESU9c4B23vRdAplxwBIplbiezvO2uiXa0e8aX3n+Z ++sl/EKE9IV9iqFLRsV5GeYyPEAv1K6ajfHqRiKJaGmHyJIXKBG8BrL/61qHiGRTSN ++KXOlog2ezjvd0MXk3GKYLUr0vz/cGCMSmpWSn4oogQNkAxICz6yeLpyeDNpXTIq/ ++7FZsIZLqPb+q7Yffth9NVlynDRoRqHKx/j1LGvX8Q4Zb/N4zSUQuewTYw7uTxw3W ++Nosu3ZP5AgMBAAECggEAA97TOWBM+xs7kSYIBIAtRyVrzVqLTKIoHWO7o4MtghDg ++KVFhCrjOrgSBCasdQ3hmD27jOPjoNkRDsy0lcn6nJ/DIF6GCtrtMYRH1uH41iXOo ++OCYo/sw5VVW8lSM6aN0cNfGKSVdlM1vx50wIvHT4I2nFZQ0+3on7cLrm/QDBsaeb ++Skm8T8o/N8rTVxejCHofibiPSsufI0QIVSEuJPcv4HCArtSDB4yzO4mDlsCh+YTE ++3QGeOJC2umLLgeTzNl/RN/Z9NUL/ClTifWILc4GqiwVEn2PC6nESuLRm2yJxJVP3 ++OUI52DTrFSaWOdIugzmzHQwDHL4wIdSnKuUJb7m23QKBgQC8ur1/B/o9QnrXLmlD ++dnJkrzU60i8MA5ax5hVlqhLSl/dyPk9RWiMLVDuzrC16opLQDUlO0l+9lOE8Q+wZ ++HfUZ2nKHUcqv/Fybv0yZCcOUBaZKXwvKmYPA/H2enpMI4oJPww3nM2yQjYAoxF3a ++sN2yK3i/0PCrHdEzavCbRP/TfQKBgQDL+4yTRMW9PUeNdn9AIvWLkNyZQ0r99lfo ++9bGgnAHXe8wH/QsE56YjDty9wUUNtdw7MFjxuzZ1aC0XzQoX631CBIwisQqb+2ie ++aMWOU9E4bH5Rfg9M21n+bh6pYwBEI2hgcUeqOM2ntU+e8Zj31lFDNIFQ3jGPkPhl ++SEv+5imzLQKBgQC3uXa1zldOAYTCK50vnoQX/fRssaY5JNkzj8+uq5UtS+EIZx4i ++DQRmh/ain2+and8cCIMf525qiR+G4nxZqy8qnty1XOtazOp+eAkiRj4NwD400jgR ++X8bCPUow+yAaGx9OdIz5ULdUNVvY0+il912qj+U5njZb7mf0jRtznAULpQKBgDdP ++17ebX29ILZ3bcvgGQsT8nATnLW+eHApsjST7CLjQteu4nwNOeUtqXUsLHFlyZeya ++2JN763F8tTWOAN2pmoaLSyChFzpiuuSxjlhgvAvrx3j7kNSLamTGoYPW95yCaWw1 ++a3RqAMIoNRXpd0xFDjYGB8bQ6Wl/qwtzxj+xU79lAoGAJM536WxkaVPLXXYwbJiH ++SA2ZejxAf0sdOgBnsJJVzXyhxrcA/AzrPeOzOKgv516iUK4TOk7IGZqvCUiZ6e4f ++kUW1crzRse+A0iSaVRn+hQsXquriokTxRYlFgOGpVu7ajhiZsYHF7cexcKNaXeq6 ++tj/3hWCpt0pymVa4TCRKtD0= ++-----END PRIVATE KEY----- +diff --git a/src/Symfony/Component/Mime/Tests/_data/sign3.crt b/src/Symfony/Component/Mime/Tests/_data/sign3.crt +index 3f907cf..41787c8 100644 +--- a/src/Symfony/Component/Mime/Tests/_data/sign3.crt ++++ b/src/Symfony/Component/Mime/Tests/_data/sign3.crt +@@ -1,19 +1,19 @@ + -----BEGIN CERTIFICATE----- +-MIIDFzCCAf8CCQDFHjZEW7DHnDANBgkqhkiG9w0BAQUFADBMMRcwFQYDVQQDDA5T +-eW1mb255TWltZSBDQTEUMBIGA1UECgwLU3ltZm9ueU1pbWUxDjAMBgNVBAcMBVBh +-cmlzMQswCQYDVQQGEwJGUjAeFw0xOTA0MjcwOTQ2MDRaFw0yMzA0MjYwOTQ2MDRa +-ME8xGjAYBgNVBAMMEVN5bWZvbnlNaW1lLVVzZXIzMRQwEgYDVQQKDAtTeW1mb255 +-TWltZTEOMAwGA1UEBwwFUGFyaXMxCzAJBgNVBAYTAkZSMIIBIjANBgkqhkiG9w0B +-AQEFAAOCAQ8AMIIBCgKCAQEAyywWINcIgcxT8GUXTx/5Xa7rkwoMh3gwNcuOhbRg +-08xupcsHAe3f6pPosqm5xweaPcw2xI+yrkXxmXEE0LU4qi7qgtBZt2GqYKcFEtZw +-fh0YV4b2NHSO/CFTY25AtwW9wUW+GHq6yYRqrjVZnP9mEokNclPNS4QWSyaNuIav +-jCB9xdDXjIc24zM4TeM5LaaFoH4qZGhp3MkjRadnMrrYsp9a3XKrYlQ5lqaXyVlC +-/aKeBZy5qckoFj0Lep6LV2xlipX4+d5tcZ2FATkXjJK834WRzFMAVhYxqFyj/RIY +-IoEk/AdYeg3b1HK19flNNQbpHPayiSg3l90ecbaN5vqgLQIDAQABMA0GCSqGSIb3 +-DQEBBQUAA4IBAQBd+sTqEPXn5MLXMNRsV9HuP4VkX79K7ThA4kXW0fj7Bp+Mpfvg +-LLUXRVcyzAKz2RgxyNIKHPr3u6OxHXbtGL5IgdH74uCR4MN+srKpLiGAMNjtvWBr +-sGG3pIfpw4sFfVkj5zLFH9MLVSkKFu7Ub2KfOh310AnSnMOJpjy8a0MqY+iOcpj7 +-ioOdPHaSQX7DZrECKozOzcfqryYBOwkbwrh1juhDYzy3WtgxZe1FRl3O3FKLtmAc +-J4At8HbMDOBH/fMR4o4B1miP6K9QWc66hsAsgY3GWrmiBf67sf1u6kNeNPBGcviW +-fQndtjrUUmwkAAQaFYjUnVEcfx55p8TrLhRC ++MIIDJDCCAgwCFEWxtZWzOzAw0F2z18+IFm03zhJcMA0GCSqGSIb3DQEBCwUAMEwx ++FzAVBgNVBAMMDlN5bWZvbnlNaW1lIENBMRQwEgYDVQQKDAtTeW1mb255TWltZTEO ++MAwGA1UEBwwFUGFyaXMxCzAJBgNVBAYTAkZSMCAXDTIzMDQxOTA5NDgxNloYDzI0 ++MjMwMTEyMDk0ODE2WjBPMRowGAYDVQQDDBFTeW1mb255TWltZS1Vc2VyMzEUMBIG ++A1UECgwLU3ltZm9ueU1pbWUxDjAMBgNVBAcMBVBhcmlzMQswCQYDVQQGEwJGUjCC ++ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJbKpm/r5TNnZ8QxHwK43LKM ++hU9wS+S9S7J0nwHLyAvwe8kUKwjoD3dhtDJr5HoPO4vnygAoJ95pY8418CuFG6sk ++novHfL+c8E3iCIVVu6CUBsMr28lxrM7yPRSideQdvXX1R+zjNWX+ImjrasnpYsXs ++coj0IQ75mnQOrcCPJfiZ2kY9lX36e2GzRYoxqSC/M1sQdZIpEH5edvC0/EirkGRL ++kjgFrc4nXeiOALk0W82mwk6O4Ody/mOHL6tDxq2/BtsEMd9xwp3OlpTL2c0zH3uO ++jaHtPvWV5Ow2SFXWToQuYFMibRaOZ2fGVLDL2q6PgLdwMbY+FjprurVTFjx0+TEC ++AwEAATANBgkqhkiG9w0BAQsFAAOCAQEAMX4d/o0nmomRekwDReFkHKEI4TtMO0Y+ ++bTAL7pbfqI6E6kpSPNbDiz2/sSmZQgxrh+QrbrxiSD7oUuIjKfpjSx9EepCb3LXT ++cC4grWcnEdUnefLjDtPQbfUb1wYgu8Agf3qEY3plNJTwzl5Jzmq+IbaPN5djOZCQ ++qJaS733xeEI0bZUa8aD3DjCLtnz8qmYhXVT8jCM4+dFze5jnZEmAuRyDW1UdFXSW ++G/JR37krDdWI7BeamkYLGz1Mydyz9CFlqT2ZlhGtkdTSsXwfUUi7Rd5YKbD+oNWg ++YQW3+wKX4VvlINfuxnGmeGl7MBJcqEl5r+EhgEGjxkHsZaSMHbnEPw== + -----END CERTIFICATE----- +diff --git a/src/Symfony/Component/Mime/Tests/_data/sign3.key b/src/Symfony/Component/Mime/Tests/_data/sign3.key +index b8b51bd..9af3460 100644 +--- a/src/Symfony/Component/Mime/Tests/_data/sign3.key ++++ b/src/Symfony/Component/Mime/Tests/_data/sign3.key +@@ -1,30 +1,30 @@ +------BEGIN RSA PRIVATE KEY----- +-Proc-Type: 4,ENCRYPTED +-DEK-Info: AES-256-CBC,5485FF78699F76CB93A05FF9CE7FB4FD +- +-iaLWaPXmnAweLnqtXLk/NwQOUNTRIV1yN9gHo0aR4fWy3GDPa08AJz+pYuDULQDY +-RCejCBHeSqH4UFbbRHkYHsOdpjEUWhOy07TesajkW3Kl3At1T7aa3cCjhYSpeWkc +-4wqzbs5byRd/mzp4G17WjJnohBXBdxCea5WzgoGL4ZeX7nqgxwpnh51VvuOBk+vY +-W6QHwpaq+lFa/G7lcoWJxmtQd3/O8apjZB9xT65II7ZeMsIP9NRLitoH7IX+GteU +-MdVgTMWVyxhEko5SXlqpZUJJ/C7CReHipI8hkfub0zsQj4FkZ/jJa3X18MQFNQZE +-YhhJOhGsv3U65J3PRkxEYeK9fIO8V4e+YeaJb3iItmgh4zfdfw0BieC08xYhuA5f +-uEzkxqrk9nWaFHtam5/skmFcE5uH3raMLTHDYkFXxqMRQamddlONuZ4Z+oAdr+VM +-zGf4oI7Dsie+PEzvbQNfphrI89TOkH8IhT6HATFKvyLG21lKgBMwFOdJg5B4zcuJ +-bh/8cqDrP5byxjDe96fOBWoH2g72f4T9SrOmpgdhEL9AOiLuBnVMQDVLthMY1xxg +-SuYxrmtPKn3eaeWHpv8RJSToFF4fl2zJm/HKEAd8ghAJa330/CnNCCQSqUrdE0xp +-xjVURJvPZxzMS9UEQhXPyYp66GYs/uLuSTjaQwymFgc/l2UMm3zjHhjyn6S382u7 +-ih+AM7y8+pIV2n8CbqoG4XR8UEr9w/ayeDSbFKGZhiqhACW8iZATgVOhmeoH7ON3 +-ib7FTNHsyr2eEZ97JeKpbG9E3sFEfHJ51d0PScKmzENGP9LNjMzWb3uot0zP0q0s +-kzulVIHnkh48gRICPIKeOL894gAL4PmRViP0x7chXk/xULueVb7T8WmCLYI+Kjaz +-X/yGCpPmrBFNAiamrHMSh4qUE+zm7OI2jNOu87tRxcXid8O9wQZDZKaE19HZJ84j +-bGghr9pKhIXdn3Z4hSyBqkBnUXNPc1g1er4DryluZ/+wKUvDkZpVmygYvQM1598b +-p/xkRxlGE3BZiLX1++wIjMJ2xmwLKGiJOR0BexXJWYz0pD22YUSto7lwmGLm3oxg +-MYIFqEgaYFc0MsZ7PRiMcovTUr/c2yHMpyveLHSLMFVmxfGKGZ+JcalCDFhkuZem +-DcMQ0bs0DjmJZvC18SYH+iym1JXHnkVSUjsYWuVGGp7zArwlyP3W1MOhHcYDVcEl +-TikNqrpgl04ti4qcdtH3TrPufMHq7Y9SM0dY1SUctyaO5yD52ozWriPuS1kTtkaL +-GwvJhqvkPyO89bK/We0dIv5KoZPFhEWFwkNMNBIT1GI8XfQZTgi5ZJI3DSr1q022 +-zvs5FruPwN2qFsvpmiakl4GhoIs8zwqqCDAO5JXhnSEZeEIB2Hsld7pRDAg3D8Me +-T10ZOqM3XRzXPfi5zls81KhkrCh/RHiXEnMseT7aLYxvUHQM+Ktr9ar9Zv42BF+r +-c5WFWDs58THPODiKYqPHpUBuIV2moTSsSWGzyvQF5TLw9/rtfrwCiBOiaqzO2odo +-h7zLceAmxJfcQ6gIaAy8t5JgAUq5Uwkk0WK2Z3RyJAejdxghQI8XNxkmvu/pM5al +------END RSA PRIVATE KEY----- ++-----BEGIN ENCRYPTED PRIVATE KEY----- ++MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIPHxHf57RcCACAggA ++MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDjM13GJueG6eINk9n9hBUeBIIE ++0AaQQdun7KwvEBz5Hj+SlV1L93cmIuH1BYkFEIrAnYFi/FJnDU949cJgmT+x7Br4 ++5Zk5RAaErIzoYKMtcyZLMbE1RoM9fcP69zqhFI99GihXUYqA2Dx62rfEPWWyL4vz ++y/HuaLfpKYKnPKQhj4nUv2uUUcQURTPIhX98uVgYbzbjLNJc1W3zTWvw5agEyFf0 ++OHEWkfb5KToKNZ4OY8MqUKxS8oDnbt1Tgf8r1Jzk2/BaBlHEw2YLvmhijFpvoDUn ++2J7adwyKLI8SYq0W4RnTLEWlM2BaePiWi/FF0G/e6KwfEDKbD8R/OmvvazP+g3tV ++19gXlMdZ7C99heLgfbriddd0Ojz7kWdbfaqVYYZOePxcuX2Dlk8DyDDzXsArpgtD ++NSXZwTGcoJTh62wvyr0RmM/dfoqro5mX3woDSS1EpgxQr+hbNH3NqVuDkcouyWhZ ++UcP7WT2FyYFmApMxKW/Nllvvps/UehGcnPmM/tqP28cdH8LALabihgCydxNWrKBM ++Oatx1v/w/ecO339UaH57HYqnQSkX3WOvBcMOin5NZLiYjc5oeoBGExglcsC+8pmC ++K7pegyxCfN28foWs7+J6Y21NH+oZYIo3mPvwhZDpxUuHuQln/1CnNwsWuvf1ipiq ++Z0SeJsj3VKLDjFWAFyCJkKPeMRcJ3WH/+0e9fxlRm0PVfy8WZoRY4Kx60cONrwuz ++Oxnd8QZqrBBUie75n5BBcudZSmi2D8p6Shjpn64sdqSHLoIOc8B1HTiaF0Mx2p3x ++zwp6JhcEUM9Nj/9bWv4ATKHB493QHEwiuqhZIaMQLaY9WDBG0VMgLiqZSc3/KTbD ++GkzJTZGSp8bVdU8lmp+lcfqWvfSNVb2zgShFdR01qd6+QtO0huomAg66Jd9EwVOh ++/KUmK2sBA77wS6t5A8Ot8dAFykx/0531ikkVdb0TE092/OG369fT1K5x2LTBGmF9 ++IOnIpOUbzAraPGKlin+TClXGjP5fb9JsHSo8XgQDHfRDnM6BMP87tUnbwF6ZQerT ++QAmiCadYlzDgWgwvjc0WGKlGEQkHh95XrvG5vKaibMLneyrY67s6e0sPhUycE23p ++A41AF7rfmparTyOEpfuoBbxX0XbAXTt+b2Jc24Qt0ghv4eF9rWQxYlxkWszIhyDh ++2OQrvxWmS/mVLN07MlAVEoAscyBVcrz2Vq5FQhAMwywy0dUcZb6MsxmDOKN0H2/5 ++ZLLEQPVpqZO0nBGy+e82xNrqJ2JnRwbnTAXpq+MvYfxhQEMukXM3Jg0bFaHbzcEE ++SY/+KlvCqgcuhlu9KUo2X1Tn8Wc8WbHbQyvE5bNN+lpjF1H0d+ptshrytvW8VZh0 ++QpjAuBPpykEfizr9KmyJubD7CyZdXyctJH9lz/eJ0uro2v3w0jOO3ZgNdvIGFGF+ ++1PqaSQmZxCIRg9jw5De0QywNvl4cB/M6uKIQ4eXIxJKJmDihOs38ITMotewhjw8B ++hXV0TR1kFJgd/IeqogFEKeN1QF/ablNguEHaK2kKnp4g7vNyF9XCcdoYw6/9EJ0R ++xFJVLZyy54qUgrBmmpKjG9HQ9/1AxdkenmweNVScuC/lWmulDRnHKiJo9wPFwq7s ++7LcdKUj+yKEVmwedyRmnaaypnMjOVzUWff+BACwDVdo0 ++-----END ENCRYPTED PRIVATE KEY----- diff -Nru symfony-4.4.19+dfsg/debian/patches/series symfony-4.4.19+dfsg/debian/patches/series --- symfony-4.4.19+dfsg/debian/patches/series 2023-02-27 23:01:40.000000000 +0100 +++ symfony-4.4.19+dfsg/debian/patches/series 2023-11-11 19:09:20.000000000 +0100 @@ -22,3 +22,5 @@ Use-single-quote-to-escape-formulas.patch HttpKernel-Remove-private-headers-before-storing-response.patch Security-Http-Remove-CSRF-tokens-from-storage-on-successf.patch +Mime-regenerate-test-certificates.patch +TwigBridge-Ensure-CodeExtension-s-filters-properly-escape.patch diff -Nru symfony-4.4.19+dfsg/debian/patches/TwigBridge-Ensure-CodeExtension-s-filters-properly-escape.patch symfony-4.4.19+dfsg/debian/patches/TwigBridge-Ensure-CodeExtension-s-filters-properly-escape.patch --- symfony-4.4.19+dfsg/debian/patches/TwigBridge-Ensure-CodeExtension-s-filters-properly-escape.patch 1970-01-01 01:00:00.000000000 +0100 +++ symfony-4.4.19+dfsg/debian/patches/TwigBridge-Ensure-CodeExtension-s-filters-properly-escape.patch 2023-11-11 19:09:20.000000000 +0100 @@ -0,0 +1,76 @@ +From: Nicolas Grekas <nicolas.grekas@gmail.com> +Date: Fri, 3 Nov 2023 17:03:49 +0100 +Subject: [TwigBridge] Ensure CodeExtension's filters properly escape their + input + +Origin: upstream, https://github.com/symfony/symfony/commit/8128c302430394f639e818a7103b3f6815d8d962 +Bug: https://symfony.com/blog/cve-2023-46734-potential-xss-vulnerabilities-in-codeextension-filters +Bug-Debian: https://bugs.debian.org/1055774 +--- + .../Bridge/Twig/Extension/CodeExtension.php | 23 +++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +diff --git a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php +index 7f60b54..b84a39c 100644 +--- a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php ++++ b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php +@@ -48,8 +48,8 @@ class CodeExtension extends AbstractExtension + public function getFilters() + { + return [ +- new TwigFilter('abbr_class', [$this, 'abbrClass'], ['is_safe' => ['html']]), +- new TwigFilter('abbr_method', [$this, 'abbrMethod'], ['is_safe' => ['html']]), ++ new TwigFilter('abbr_class', [$this, 'abbrClass'], ['is_safe' => ['html'], 'pre_escape' => 'html']), ++ new TwigFilter('abbr_method', [$this, 'abbrMethod'], ['is_safe' => ['html'], 'pre_escape' => 'html']), + new TwigFilter('format_args', [$this, 'formatArgs'], ['is_safe' => ['html']]), + new TwigFilter('format_args_as_text', [$this, 'formatArgsAsText']), + new TwigFilter('file_excerpt', [$this, 'fileExcerpt'], ['is_safe' => ['html']]), +@@ -95,22 +95,23 @@ class CodeExtension extends AbstractExtension + $result = []; + foreach ($args as $key => $item) { + if ('object' === $item[0]) { ++ $item[1] = htmlspecialchars($item[1], \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset); + $parts = explode('\\', $item[1]); + $short = array_pop($parts); + $formattedValue = sprintf('<em>object</em>(<abbr title="%s">%s</abbr>)', $item[1], $short); + } elseif ('array' === $item[0]) { +- $formattedValue = sprintf('<em>array</em>(%s)', \is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]); ++ $formattedValue = sprintf('<em>array</em>(%s)', \is_array($item[1]) ? $this->formatArgs($item[1]) : htmlspecialchars(var_export($item[1], true), \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset)); + } elseif ('null' === $item[0]) { + $formattedValue = '<em>null</em>'; + } elseif ('boolean' === $item[0]) { +- $formattedValue = '<em>'.strtolower(var_export($item[1], true)).'</em>'; ++ $formattedValue = '<em>'.strtolower(htmlspecialchars(var_export($item[1], true), \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset)).'</em>'; + } elseif ('resource' === $item[0]) { + $formattedValue = '<em>resource</em>'; + } else { + $formattedValue = str_replace("\n", '', htmlspecialchars(var_export($item[1], true), \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset)); + } + +- $result[] = \is_int($key) ? $formattedValue : sprintf("'%s' => %s", $key, $formattedValue); ++ $result[] = \is_int($key) ? $formattedValue : sprintf("'%s' => %s", htmlspecialchars($key, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset), $formattedValue); + } + + return implode(', ', $result); +@@ -178,13 +179,17 @@ class CodeExtension extends AbstractExtension + public function formatFile($file, $line, $text = null) + { + $file = trim($file); ++ $line = (int) $line; + + if (null === $text) { +- $text = $file; +- if (null !== $rel = $this->getFileRelative($text)) { +- $rel = explode('/', $rel, 2); +- $text = sprintf('<abbr title="%s%2$s">%s</abbr>%s', $this->projectDir, $rel[0], '/'.($rel[1] ?? '')); ++ if (null !== $rel = $this->getFileRelative($file)) { ++ $rel = explode('/', htmlspecialchars($rel, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset), 2); ++ $text = sprintf('<abbr title="%s%2$s">%s</abbr>%s', htmlspecialchars($this->projectDir, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset), $rel[0], '/'.($rel[1] ?? '')); ++ } else { ++ $text = htmlspecialchars($file, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset); + } ++ } else { ++ $text = htmlspecialchars($text, \ENT_COMPAT | \ENT_SUBSTITUTE, $this->charset); + } + + if (0 < $line) {Attachment: signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---
- To: 1055988-done@bugs.debian.org
- Subject: Released with 11.9
- From: Jonathan Wiltshire <jmw@coccia.debian.org>
- Date: Sat, 10 Feb 2024 13:02:56 +0000
- Message-id: <E1rYn0S-002xq1-8N@coccia.debian.org>
Version: 11.9 The upload requested in this bug has been released as part of 11.9.
--- End Message ---