diff --git a/pyas2lib/tests/fixtures/cert_mecas2_public.pem b/pyas2lib/tests/fixtures/cert_mecas2_public.pem index 7bacc9b..99cdfaa 100644 --- a/pyas2lib/tests/fixtures/cert_mecas2_public.pem +++ b/pyas2lib/tests/fixtures/cert_mecas2_public.pem @@ -1,20 +1,21 @@ -----BEGIN CERTIFICATE----- -MIID6DCCAtCgAwIBAgIEV3EEFTANBgkqhkiG9w0BAQUFADCBtTEvMC0GCSqGSIb3DQEJARYgd2Vi -bWFzdGVyQG1haWxhZGRyZXNzb25kb21haW4udG8xCzAJBgNVBAYTAmRlMRMwEQYDVQQIDApTdGF0 -ZSBuYW1lMRYwFAYDVQQHDA1Mb2NhbGl0eSBuYW1lMRUwEwYDVQQKDAxZb3VyIGNvbXBhbnkxIDAe -BgNVBAsMF1lvdXIgY29tcGFueSBkZXBhcnRtZW50MQ8wDQYDVQQDDAZtZWNhczIwHhcNMTYwNjI3 -MTA0NjQ1WhcNMTcwNjI3MTA0NjQ1WjCBtTEvMC0GCSqGSIb3DQEJARYgd2VibWFzdGVyQG1haWxh -ZGRyZXNzb25kb21haW4udG8xCzAJBgNVBAYTAmRlMRMwEQYDVQQIDApTdGF0ZSBuYW1lMRYwFAYD -VQQHDA1Mb2NhbGl0eSBuYW1lMRUwEwYDVQQKDAxZb3VyIGNvbXBhbnkxIDAeBgNVBAsMF1lvdXIg -Y29tcGFueSBkZXBhcnRtZW50MQ8wDQYDVQQDDAZtZWNhczIwggEiMA0GCSqGSIb3DQEBAQUAA4IB -DwAwggEKAoIBAQCQqgqomGqMl1+nNHPhYE759aRapZqKnPb73z5X3YTQ+Ss0WhEYFiYPC3Dfgv1r -mxr73s5ipOZepLfsPzMIWn6L5/1jmbcMs3dbpmYUR7YRXn6ov4MQZM7HVTzKwwHb1Y6x5knZ6zWs -lT0J2ep+BnfPQkPfnhAUl6jdXJe+Ubjs/Dc/KgjUQc5c7Hj23B/WuoFLw7dKQ7MepYCqItKU2bUV -0MZC8UPeAlLql6CxxBHtrGXgO8F/lYgdTkUhXqbXLYbRvDiY3ECkWTGiY08xo11pXYOTuh00bewQ -hi2pr323HeG+44g0swo4P3k+rBtmUwbH7pHzgMZ/EBYKR0UN8PeVAgMBAAEwDQYJKoZIhvcNAQEF -BQADggEBABlJKhs5WXiB2oiRD5LE5CvJh/6L2gc7E1p6CxQn4nbmF6MkeHgbnQpklcmVjAB5EX/h -2O8Jr19YIAIWApnkYsa32/Ehnjv5sthfeyRrjkStz43Hbl5z8XTvriUYp06ksfr3fu5og28xQWst -6rMQOiGUyDpR5CvqcNx2xsdRgN9v8dL6tcPkMtKLqTScw3xtMLwnlpVV/x61beMZTOuZXkleqBtH -I1F3bHOW55H2VfCGXLuYFykR1lS5hVGUW6UEfK7mRD3w22/uNDUUaYvjBztrb7+5ZMSCcnNoay9E -bIWVlt97wnViTpwJssgwdSH4H4vJ/TXrPH1BhDzYg5HnK5Y= +MIIEJTCCAw2gAwIBAgIEWipbHDANBgkqhkiG9w0BAQsFADCBujEjMCEGCSqGSIb3DQEJARYUc2Vy +dmljZUBtZW5kZWxzb24uZGUxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcM +BkJlcmxpbjEiMCAGA1UECgwZbWVuZGVsc29uLWUtY29tbWVyY2UgR21iSDEhMB8GA1UECwwYRG8g +bm90IHVzZSBpbiBwcm9kdWN0aW9uMR0wGwYDVQQDDBRtZW5kZWxzb24gdGVzdCBrZXkgMzAeFw0x +NzEyMDgwOTI3NTZaFw0yNzEyMDYwOTI3NTZaMIG6MSMwIQYJKoZIhvcNAQkBFhRzZXJ2aWNlQG1l +bmRlbHNvbi5kZTELMAkGA1UEBhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGlu +MSIwIAYDVQQKDBltZW5kZWxzb24tZS1jb21tZXJjZSBHbWJIMSEwHwYDVQQLDBhEbyBub3QgdXNl +IGluIHByb2R1Y3Rpb24xHTAbBgNVBAMMFG1lbmRlbHNvbiB0ZXN0IGtleSAzMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjVOG3wM5krK1Sux4ZFrYgLzf6Ru3RmlCE9UmRyFyJlzUF2aH +F2lq7KW1HISMA0doJARksnHHVeQn5AeItpCwA4ypqItkKXjYGOeR00ZuyiH22qNoVv+pfA9DP3TE +kopx75ux1KFu6/sdATsu7nFaiPyh2Qk6XE4sZ0FL+qRh+1UZDqo1zxVAOC62nBxZPc5I/rg9JPI7 +KLrBc8uu1gNTYEAQPUxEDJlGFwnPpm4xeMKWSpQhP3/+QxLnOkWI7awcJFIxeaF/1ug5cyH+4xwf +gLV65sEKKXgzjvHHnpiDc3Fhq2WHQR5gx58D4JbZlAlMMCU7dJDJvQp5dZBFhxE0qQIDAQABozEw +LzAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA0GCSqGSIb3 +DQEBCwUAA4IBAQBUP3uPOyvSwbJdKJftYOfdEtSFgQJRMFyJb/zY3BhtFW9ylVkze+pQLLjDy4nL +F7nGpa36v5TxXbSSfP3o4NS1Rc4rb5g/hGi0Lx1iyfCYDbCVI5t8NdM8jfxkjb6bYQkja7479N9+ +bCvM8pKFflfEe2sfi4t6qqa4qXYYtVSwTJspD8pgRnMdAS5hd/DkseWwqHEOfLnWiwtAgS8aFyaf +GdZKfToVsLnkFDwbu3gcGhxX+eZz93uuXc9hK9xNYl+DGCv9b3M5S6ynQRP4h4Y6+RXH/MkRHp4C +eH3dWhrG2os1gUfiQYSuFJGJ+SWV1XR9r7jkBo0qm+Gi5PIcExbH -----END CERTIFICATE----- diff --git a/pyas2lib/tests/fixtures/cert_test.p12 b/pyas2lib/tests/fixtures/cert_test.p12 index 757ee9b..6cb6f51 100644 Binary files a/pyas2lib/tests/fixtures/cert_test.p12 and b/pyas2lib/tests/fixtures/cert_test.p12 differ diff --git a/pyas2lib/tests/fixtures/cert_test.pem b/pyas2lib/tests/fixtures/cert_test.pem index 924764a..8133b30 100644 --- a/pyas2lib/tests/fixtures/cert_test.pem +++ b/pyas2lib/tests/fixtures/cert_test.pem @@ -1,54 +1,51 @@ -----BEGIN ENCRYPTED PRIVATE KEY----- -MIIFHzBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQIp4suuwFA6BkCAggA -MB0GCWCGSAFlAwQBKgQQVKJij8RAKGC8jwtPG95G6gSCBNDGGu1eIVzadE6x8aXT -KXKVZcxg6U8ZPdvprP+ncccZyjJC+fg4M2XJAqAHzaY9G48POnVdniZtgP+8ix7/ -zM74gBEt2UIHDb79W0LDCzFFXRVS5+H2ezg/La8xYqvrdjwY2mL5IKGLxu7uUiqu -TR9Gp4xK1O4Z5X8a/BRtjMQUCOi1MYEltqjF5ViDUAlM/05Sy1v29sx6qvAJO/MX -IrFoWi+L2hnqOUCzivgA8Jod92UxJ2tf4hUW11utlOwS1/H0KVmLsMDfMpR+MTTV -lVmLSNPXONg4IWivugnNBofzvWwlyGQ35Bj+DRAoUl7B2mGWpv/9gmX2mt6YzEcM -s9sppAuJ02kJNjDuHaXHgi6NBicTKZebl7DH1NJr+7dZx9H1swsVs3PMZIto7yo9 -rNVByZtOqpUpwPLHQ3upPuYaTzG276dv4G2hN81wokFDrSOt5XhEu+mOpJ3/fqm9 -XdEJbLFHKFRasr7QXoBTP+qPXFp0fV6YAAhvLzz7CziDiTlXaZLPjsYwgkTw4g1m -LT2crWxZR13v0qmIbXOhIX4znjDKkV3QSanD/uBa4vNRf9zcl9qBbKHHVaNNBp+W -9iwMS/naHvfbEycTZZtb+7kGEdKzmjJOEH6t+HBI+4fA97jw21vDKnrQBcqpUpS9 -/dGN1o3DxRo8URGYeYl81fy1xKCfdvsIoHxfkpaieETMUHmPxaWUfv3nsl7vpIRY -KuA/K1WlJ3zZNoUsmlEm0BZ69EhQimdVw8hnEujuNQ0QHi4mun6WTe6k1lE/3NRt -NwIyNEkVoSu3MKrApILL/LDsDcH2BRcb1ZUu1LuQMSMoFkfiZQYJvU9VzSJTv+CF -cwp0U//r6CgQZVIJlmkh6WJHefA6A6R9bP67ZypMI2bBQhtBHlgd9YK8Yh3oSvK9 -arHeFvxxN+acvePw0zWL9ldotM6MQ5hY5lefCQIUzq9JI7g2qKsPW7U+Sz1TUu3W -jsvxrXNKuCsh6RhmI7hCXTWmBF+4caxczZfbhuO6Yr+1+pjhmyru6Us5C+pykZyv -52Po8eqUIN49sKanPmnA6JF8nhu1QnOrEtODTplG55wuqASJ6G3urz9n2ZLXDmq6 -TtdlyccipU7AgscKctGvXBCP2gY1vh3Hi6x93pjaWIQVzCmy8nH+xn707lTs7QiK -uf7gUZFwOcH3hK+u8TDOSqOz5m5R3ZlLtWMVLttpvBn6ke2tTt8oTcgtctaPozBz -NoDOc+QrHa6frfd5kL06vvSUfgN9UMlim0ILJ04rp1A6BfUy8TnAF/q4NZtrzCC7 -2Q1p35XItXUOL4fVAQdWegBiTwUa412rQxRJjYhNJbdk1LSRSSLa0YKPO9jK2clK -zdf3BjxXX8XHtU6hsX1MuDKYKtHBAEh1IgAJcLOb+vCpnXGmP9mz77hVXgiT+7o+ -JFa8EH2P7tpOI1JBuFJi3PrbC8B/HWW95Fn6pm5cm9s1tPTq9FhnrS8Ts2VzjHjJ -VZRxMmD2wSLvDKv1fI2qQa+SOlLKdmjYyYXvQCZ3n1TH9OAk/6FJS5wyCygIo+q2 -1V8GYRPMzA13BjOU/JUDZnU9Zy9RFSiZTZbbrKMeRU+als833z57NUNf8klITKO0 -qDA5YaDz3HA9uQm11ejq/Q5C8A== +MIIFHzBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQIOP5vfBVfEC8CAggA +MB0GCWCGSAFlAwQBKgQQHpJ6odD/hY89EZA6zTKpMgSCBNAIQoEg8CWHYtL8TQTc +qQPUikli4mlc3XXuyxTiFvgrKdlCJiy48Qyjltfuy6wvHNS8RG4Mr31i6ZCZlLzA +57O+7q+iud2I3Lto9oJxd59NF46nshpCN3qqObvxRMy1s2STKijw7VpGZBmUVboP +2GfRJLwPbKLGVk9i6Nz338miHmheq4qqyYOKMzjtwlnrXOnY6a6nSnkqvIzqev3y +k6wILzzzV1iRlzRVcSBj60MilvMD9NFfH9JWlMtVldu7t60S6l0YerlyxdAOqhzn +bVPKpM9MRaLm0vGnBOYT9hiql3e/a+HHLhPdjPLeHqEaUEe3sGBbkOLcuEGAv12/ +RHMcIMYGku8wDuTxeFTK5Isl6W4sjYrBnOUGk4IRE+w/eUys92YnM2LpcVdJg7et +zgLELuN95ZcreQat8Oj9j1laAGY+HyufXvCVo4pLD3UcAgLP9yDFcQwpmWibE62I +GqZoxL4bUMzwfElmFSEFTWS8aXvbnnGbOh57bmeAg4CtmDxQnGEqAs4aY4+i/lEb +bdBwctpE0c03sfSB4Z9OyWZI5H9wG5f22QhDN/UAwKsXILAQF1gkpgwIYFgg5YzW +wHdBzIxLTUZEuG2HvN+aMJdNMPZ6M7kajSmVn0M12HnnVjS3fOmzJilsLN4blNnU +8i5sT7B10ULg9vVEwlF98k5of5BlSrOpBOeWWiSRx+8WOUouM3/8E/fcIq9A5enW +4kRbFO2MTpEK7i1gqrfcHjLUElv5h2ARQNt5NZ8qly8cDV+3kb7NsOhaCbw1jKCn +tjtHYHn00Q0xq3/HGCZrDwGci8pKq78GUJnKzSNEob5kAG8Y2YxgXnvq9pA6s1di +l8s/zNKOdaXq1paup1Gbvzx1d6A0xc/S0yy5rCwR+bATnUM/EiNiJpU5XlNw20kb +2Wm9YVlHFu/PKfWhl5UQm1JT5fCRb29qlg71bcNL+8QI1hilTdDt6BSvAuKnDZWy +ghgQXDtQnFcg/qSuXEKykipH0GW6opLruX3jsPE1WgLgZxMcNgi1oYSEKb/ANRT6 +YN/TvcxQtXmoXk5FKyzwFMNlRBO5sPMC5+vgR/Kw690PtHz/PXJRAyQjlDrhcp+t +gfSdw7b2zdrUNN5pVWOdqkFI7s1+jFt0PkZiQ+Fjpic1KHNe5MJGOsfYnqWAWQXz +1NtktB+ivI7V1MRpTWeHC4VSVZ9T6z3PJGv6eQSHnJqLqNXLl/IBqUB/IDzD01iX +8ap61xEUhdxKTb7RzpACELCTHrlg1QF/3eVrkhpjmIO4m02Jmbfwcd2FKAefg5J4 +eqXBjdYnjwZ61lBfJ+NuE+fSpkmD8oyHHYcj2aDNPEBEBjhGajZXu4FtmDGD7n3c +fo+lOCvBrqWKxwj1bZ/Aueein+0Rx83vnMOSYvkllYfT18XlzsvBWr3/uGC3AFib +1DRjSaQdZTupBhJ2oMVCC2zRhb49su+kFivfZI3VrsHegFE1g80LM2dhChFfUTO2 +Fa6/guAz/ukJQvE/J4DhMXAAVdUBo3IeCL0aB9/AxM+8gNN9Y3cpqgbfBzHpOAUc +T7L5moy8PMXF/IAy1BwNkaqLmmJKRpp0FqbnjUMNyOm18vV8hT3mwIpHLNLCZzpD +M1Z/QvTdrohL6VAbRcmUUkkupw== -----END ENCRYPTED PRIVATE KEY----- -----BEGIN CERTIFICATE----- -MIID8DCCAtigAwIBAgIJAPt2MZjIdR/YMA0GCSqGSIb3DQEBBQUAMFgxCzAJBgNV -BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX -aWRnaXRzIFB0eSBMdGQxETAPBgNVBAMTCHB5YXMybGliMB4XDTE2MTEyOTA3NTU1 -MVoXDTIxMTEyODA3NTU1MVowWDELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUt -U3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDERMA8GA1UE -AxMIcHlhczJsaWIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzVbP6 -P3sPFRUfJmRJbi0MabcLRt7lySgjPAu4feXqasCtxS6rdRgYqFrPADfzmGEvmNMJ -QuH/1f2JrS1SZSqJ7JqXbEVCvbFaFFETFq1cl75OaudsW51f3VWWk4NtklG2+ce1 -0a7e7FbBJ43TTT95dEuF5vXbNoM+aN+DeYl7Mj68Ymn/DjXZnwn24FCHymYsvnRk -mOmAP3Qa/hACWggb4FhKR7vwP7OVJDHbLrcu7IfwZLOJVaDSOzuE/10gSizHXgej -rRBhmUqleIxU9BR/0zwaTyKShXR1Ym5IlyZ1iQwSb1846GPrYlRC9SezK1uTZWwd -8PcSJnWJtkxllAj5AgMBAAGjgbwwgbkwHQYDVR0OBBYEFBYf9DTNFFSS7EhO9YEd -IeBNFLVjMIGJBgNVHSMEgYEwf4AUFh/0NM0UVJLsSE71gR0h4E0UtWOhXKRaMFgx -CzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRl -cm5ldCBXaWRnaXRzIFB0eSBMdGQxETAPBgNVBAMTCHB5YXMybGliggkA+3YxmMh1 -H9gwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAfBmcU6bTE3NCMywm -3jcET2pVNJBnCsyyZ8bPU5gPzLXaUbfihg4JEXWOuvrLBOFC5aZfOiIyPEyffkdQ -KJ5dYK7YbpogTsJJPd4ADraWDxPdGa2cWpd1BtxaW5smC7uiu1S7fwGYNNvYpIvy -kHezJL+LAJ//OYA/P2gkg9WpGUNISEsqbDCf3PPbOQ93nxuYFfGE8eNYARwn31Xt -dn+smhfFIhCwz3Puq9VJunXNjwm9UrqE9hL215md0TlVw2RjSvcTyAVBn7kUyB4L -6IyTKpLksHhfwHbZO3ZYXrbgyRn97DBb02EK2eOexy1CzoBcAfOieYuju665rPEn -1E4Z7w== +MIIDLjCCAhYCCQDQCbI+X/5mlzANBgkqhkiG9w0BAQsFADBZMQswCQYDVQQGEwJB +VTETMBEGA1UECAwKU29tZS1TdGF0ZTEiMCAGA1UECgwZSW50ZXJuZXQgV2lkZ2l0 +cyBQdHkgTHRkLDERMA8GA1UEAwwIcHlhczJsaWIwHhcNMjIwMTAzMTYwNzI3WhcN +MzIwMTAxMTYwNzI3WjBZMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0 +ZTEiMCAGA1UECgwZSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkLDERMA8GA1UEAwwI +cHlhczJsaWIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9GdYaZ2nb +Swv9ciVgnd5YGgKk9MyVgg6qY+gnrarJ2Ii2gMl2CtiaCSIMpVCaq7LRqIXIsGY/ +7N+/WtESUL8SAmDu+5J5OYWBw5WbrYazpvx9EIRjd3mM0ejzU3U3q/P4D7OhiaJF +kNpc5Tuup/PCtKkdMLvCPITJQkt2dlWrvrR8Kl3CWCJHqLZytOmOKBO+1hleT9XN +waaf3nSc6t9YXq/RUQdUQKkcmiAhqWixyjh4v9o0QFo8qnvIGF0n4i+E1LNaIVSD +Pe6ULkWfpQLc1Ik9QceTyw/yAwUwoI1f016UeQIGCjGoErYCRNtyb74IutETMTcb +oIIEoA1T1SM5AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAAA3Gh0CSnfu7RvT37wq +eNWaIeWl3akLbgHAkDoW500D/l6g+zXXYFXZ0bafh0bNV2WKv/lLxc8GW53J2t0k +A/QYUoaWWZBMogResu99eKafZZECcYZdWbXQpvpfwwLq57sPISUko7yEYNWn2DS3 +ro26dQmPkyV78x3TXJuQL4ofEVDcB9jYWGIqPZ/n9alBK95ogJF/G6Mq+XYWSYtH +0He6YW1UASYgtNRHwPLMro6RYlJDsdOWTKkbs3kjroAUtaAj50S3mKjy5J0ERLTn +d+hTtFpCQCoe6m5xGsj3jssuFLT4js5MRzAo7qETcNYkeOCBWkZYOKXH3e5gMqk1 +RtI= -----END CERTIFICATE----- + diff --git a/pyas2lib/tests/fixtures/cert_test_public.pem b/pyas2lib/tests/fixtures/cert_test_public.pem index e93f50b..1e82dac 100644 --- a/pyas2lib/tests/fixtures/cert_test_public.pem +++ b/pyas2lib/tests/fixtures/cert_test_public.pem @@ -1,24 +1,20 @@ -----BEGIN CERTIFICATE----- -MIID8DCCAtigAwIBAgIJAPt2MZjIdR/YMA0GCSqGSIb3DQEBBQUAMFgxCzAJBgNV -BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX -aWRnaXRzIFB0eSBMdGQxETAPBgNVBAMTCHB5YXMybGliMB4XDTE2MTEyOTA3NTU1 -MVoXDTIxMTEyODA3NTU1MVowWDELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUt -U3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDERMA8GA1UE -AxMIcHlhczJsaWIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzVbP6 -P3sPFRUfJmRJbi0MabcLRt7lySgjPAu4feXqasCtxS6rdRgYqFrPADfzmGEvmNMJ -QuH/1f2JrS1SZSqJ7JqXbEVCvbFaFFETFq1cl75OaudsW51f3VWWk4NtklG2+ce1 -0a7e7FbBJ43TTT95dEuF5vXbNoM+aN+DeYl7Mj68Ymn/DjXZnwn24FCHymYsvnRk -mOmAP3Qa/hACWggb4FhKR7vwP7OVJDHbLrcu7IfwZLOJVaDSOzuE/10gSizHXgej -rRBhmUqleIxU9BR/0zwaTyKShXR1Ym5IlyZ1iQwSb1846GPrYlRC9SezK1uTZWwd -8PcSJnWJtkxllAj5AgMBAAGjgbwwgbkwHQYDVR0OBBYEFBYf9DTNFFSS7EhO9YEd -IeBNFLVjMIGJBgNVHSMEgYEwf4AUFh/0NM0UVJLsSE71gR0h4E0UtWOhXKRaMFgx -CzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRl -cm5ldCBXaWRnaXRzIFB0eSBMdGQxETAPBgNVBAMTCHB5YXMybGliggkA+3YxmMh1 -H9gwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAfBmcU6bTE3NCMywm -3jcET2pVNJBnCsyyZ8bPU5gPzLXaUbfihg4JEXWOuvrLBOFC5aZfOiIyPEyffkdQ -KJ5dYK7YbpogTsJJPd4ADraWDxPdGa2cWpd1BtxaW5smC7uiu1S7fwGYNNvYpIvy -kHezJL+LAJ//OYA/P2gkg9WpGUNISEsqbDCf3PPbOQ93nxuYFfGE8eNYARwn31Xt -dn+smhfFIhCwz3Puq9VJunXNjwm9UrqE9hL215md0TlVw2RjSvcTyAVBn7kUyB4L -6IyTKpLksHhfwHbZO3ZYXrbgyRn97DBb02EK2eOexy1CzoBcAfOieYuju665rPEn -1E4Z7w== +MIIDLjCCAhYCCQDQCbI+X/5mlzANBgkqhkiG9w0BAQsFADBZMQswCQYDVQQGEwJB +VTETMBEGA1UECAwKU29tZS1TdGF0ZTEiMCAGA1UECgwZSW50ZXJuZXQgV2lkZ2l0 +cyBQdHkgTHRkLDERMA8GA1UEAwwIcHlhczJsaWIwHhcNMjIwMTAzMTYwNzI3WhcN +MzIwMTAxMTYwNzI3WjBZMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0 +ZTEiMCAGA1UECgwZSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkLDERMA8GA1UEAwwI +cHlhczJsaWIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9GdYaZ2nb +Swv9ciVgnd5YGgKk9MyVgg6qY+gnrarJ2Ii2gMl2CtiaCSIMpVCaq7LRqIXIsGY/ +7N+/WtESUL8SAmDu+5J5OYWBw5WbrYazpvx9EIRjd3mM0ejzU3U3q/P4D7OhiaJF +kNpc5Tuup/PCtKkdMLvCPITJQkt2dlWrvrR8Kl3CWCJHqLZytOmOKBO+1hleT9XN +waaf3nSc6t9YXq/RUQdUQKkcmiAhqWixyjh4v9o0QFo8qnvIGF0n4i+E1LNaIVSD +Pe6ULkWfpQLc1Ik9QceTyw/yAwUwoI1f016UeQIGCjGoErYCRNtyb74IutETMTcb +oIIEoA1T1SM5AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAAA3Gh0CSnfu7RvT37wq +eNWaIeWl3akLbgHAkDoW500D/l6g+zXXYFXZ0bafh0bNV2WKv/lLxc8GW53J2t0k +A/QYUoaWWZBMogResu99eKafZZECcYZdWbXQpvpfwwLq57sPISUko7yEYNWn2DS3 +ro26dQmPkyV78x3TXJuQL4ofEVDcB9jYWGIqPZ/n9alBK95ogJF/G6Mq+XYWSYtH +0He6YW1UASYgtNRHwPLMro6RYlJDsdOWTKkbs3kjroAUtaAj50S3mKjy5J0ERLTn +d+hTtFpCQCoe6m5xGsj3jssuFLT4js5MRzAo7qETcNYkeOCBWkZYOKXH3e5gMqk1 +RtI= -----END CERTIFICATE----- diff --git a/pyas2lib/tests/fixtures/mecas2_compressed.as2 b/pyas2lib/tests/fixtures/mecas2_compressed.as2 index f0b0b05..67ccb14 100644 Binary files a/pyas2lib/tests/fixtures/mecas2_compressed.as2 and b/pyas2lib/tests/fixtures/mecas2_compressed.as2 differ diff --git a/pyas2lib/tests/fixtures/mecas2_compressed_signed_encrypted.as2 b/pyas2lib/tests/fixtures/mecas2_compressed_signed_encrypted.as2 index 6a918c2..b646254 100644 Binary files a/pyas2lib/tests/fixtures/mecas2_compressed_signed_encrypted.as2 and b/pyas2lib/tests/fixtures/mecas2_compressed_signed_encrypted.as2 differ diff --git a/pyas2lib/tests/fixtures/mecas2_encrypted.as2 b/pyas2lib/tests/fixtures/mecas2_encrypted.as2 index 2619364..11fe546 100644 Binary files a/pyas2lib/tests/fixtures/mecas2_encrypted.as2 and b/pyas2lib/tests/fixtures/mecas2_encrypted.as2 differ diff --git a/pyas2lib/tests/fixtures/mecas2_signed.as2 b/pyas2lib/tests/fixtures/mecas2_signed.as2 index 62ed5e9..b3223cf 100644 --- a/pyas2lib/tests/fixtures/mecas2_signed.as2 +++ b/pyas2lib/tests/fixtures/mecas2_signed.as2 @@ -1,23 +1,25 @@ -from: as2@company.com +content-length: 3669 +content-type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha256; boundary="----=_Part_211_306083396.1641304626706" +as2-version: 1.2 ediint-features: multiple-attachments, CEM -message-id: -content-length: 4080 -user-agent: mendelson opensource AS2 1.1 build 47 - www.mendelson-e-c.com -connection: close, TE mime-version: 1.0 +recipient-address: http://host.docker.internal:8000/pyas2/as2receive/ +message-id: +as2-from: mecas2 +as2-to: pyas2lib subject: AS2 message -as2-to: pyas2mac -host: 127.0.0.1:8081 +from: as2@company.com +connection: close, TE +date: Tue, 04 Jan 2022 13:57:06 UTC +disposition-notification-to: http://www.company.com:8080/as2/HttpReceiver +content-disposition: attachment; filename="smime.p7m" +host: host.docker.internal:8000 +user-agent: mendelson opensource AS2 1.1 build 59 - www.mendelson-e-c.com expect: 100-continue -as2-from: mecas2 -disposition-notification-options: signed-receipt-protocol=optional, pkcs7-signature; signed-receipt-micalg=optional, sha1 -disposition-notification-to: http://localhost:8080/as2/HttpReceiver -date: Tue, 29 Nov 2016 13:33:36 IST -recipient-address: http://127.0.0.1:8081/pyas2/as2receive -as2-version: 1.2 -Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="----=_Part_1_1464954728.1480403996634" -------=_Part_1_1464954728.1480403996634 +Date: Tue, 4 Jan 2022 13:57:06 +0000 (UTC) + +------=_Part_211_306083396.1641304626706 Content-Type: application/EDI-Consent Content-Transfer-Encoding: binary Content-Disposition: attachment; filename=payload.txt @@ -51,40 +53,43 @@ CNT+2:3' UNT+26+1' UNZ+1+5' -------=_Part_1_1464954728.1480403996634 +------=_Part_211_306083396.1641304626706 Content-Type: application/pkcs7-signature; name=smime.p7s; smime-type=signed-data Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature -MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIAwggPoMIIC -0KADAgECAgRXcQQVMA0GCSqGSIb3DQEBBQUAMIG1MS8wLQYJKoZIhvcNAQkBFiB3ZWJtYXN0ZXJA -bWFpbGFkZHJlc3NvbmRvbWFpbi50bzELMAkGA1UEBhMCZGUxEzARBgNVBAgMClN0YXRlIG5hbWUx -FjAUBgNVBAcMDUxvY2FsaXR5IG5hbWUxFTATBgNVBAoMDFlvdXIgY29tcGFueTEgMB4GA1UECwwX -WW91ciBjb21wYW55IGRlcGFydG1lbnQxDzANBgNVBAMMBm1lY2FzMjAeFw0xNjA2MjcxMDQ2NDVa -Fw0xNzA2MjcxMDQ2NDVaMIG1MS8wLQYJKoZIhvcNAQkBFiB3ZWJtYXN0ZXJAbWFpbGFkZHJlc3Nv -bmRvbWFpbi50bzELMAkGA1UEBhMCZGUxEzARBgNVBAgMClN0YXRlIG5hbWUxFjAUBgNVBAcMDUxv -Y2FsaXR5IG5hbWUxFTATBgNVBAoMDFlvdXIgY29tcGFueTEgMB4GA1UECwwXWW91ciBjb21wYW55 -IGRlcGFydG1lbnQxDzANBgNVBAMMBm1lY2FzMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBAJCqCqiYaoyXX6c0c+FgTvn1pFqlmoqc9vvfPlfdhND5KzRaERgWJg8LcN+C/WubGvvezmKk -5l6kt+w/Mwhafovn/WOZtwyzd1umZhRHthFefqi/gxBkzsdVPMrDAdvVjrHmSdnrNayVPQnZ6n4G -d89CQ9+eEBSXqN1cl75RuOz8Nz8qCNRBzlzsePbcH9a6gUvDt0pDsx6lgKoi0pTZtRXQxkLxQ94C -UuqXoLHEEe2sZeA7wX+ViB1ORSFeptcthtG8OJjcQKRZMaJjTzGjXWldg5O6HTRt7BCGLamvfbcd -4b7jiDSzCjg/eT6sG2ZTBsfukfOAxn8QFgpHRQ3w95UCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA -GUkqGzlZeIHaiJEPksTkK8mH/ovaBzsTWnoLFCfiduYXoyR4eBudCmSVyZWMAHkRf+HY7wmvX1gg -AhYCmeRixrfb8SGeO/my2F97JGuORK3PjcduXnPxdO+uJRinTqSx+vd+7miDbzFBay3qsxA6IZTI -OlHkK+pw3HbGx1GA32/x0vq1w+Qy0oupNJzDfG0wvCeWlVX/HrVt4xlM65leSV6oG0cjUXdsc5bn -kfZV8IZcu5gXKRHWVLmFUZRbpQR8ruZEPfDbb+40NRRpi+MHO2tvv7lkxIJyc2hrL0RshZWW33vC -dWJOnAmyyDB1Ifgfi8n9Nes8fUGEPNiDkecrlgAAMYICfDCCAngCAQEwgb4wgbUxLzAtBgkqhkiG -9w0BCQEWIHdlYm1hc3RlckBtYWlsYWRkcmVzc29uZG9tYWluLnRvMQswCQYDVQQGEwJkZTETMBEG -A1UECAwKU3RhdGUgbmFtZTEWMBQGA1UEBwwNTG9jYWxpdHkgbmFtZTEVMBMGA1UECgwMWW91ciBj -b21wYW55MSAwHgYDVQQLDBdZb3VyIGNvbXBhbnkgZGVwYXJ0bWVudDEPMA0GA1UEAwwGbWVjYXMy -AgRXcQQVMAkGBSsOAwIaBQCggZMwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0B -CQUxDxcNMTYxMTI5MDcyMDAxWjAjBgkqhkiG9w0BCQQxFgQU6ODtTdZVjneUeoN+ChUV5Npf4jEw -NAYJKoZIhvcNAQkPMScwJTAKBggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwBwYFKw4DAgcwDQYJ -KoZIhvcNAQEBBQAEggEAYuRdE2cFCNzX9bgG38QYShPpoNsRGcQeXdZwwjY8mvXzJnGZdVoY8xk2 -zkgZewVSuVyQ/GpoC3QnSvusJaoA0wjobqQOaRzqvN4y9GMgpxk0jd4d+s6G/SUyjZK/TeVh2o1P -ZEaP8MtdkL3DeXhCKSgQ+iBUOiP8rd15NB2CQOKAxQ7XL7+SEudbT4CTByRZRfvbopGYxielCjWY -z08c4dqtkJv5PHj8gMAVUp6aXC2SdPSv3/hZSge7ovPJz4peOUZMjbRXc6sY6Tnale00H5AWOt/y -nff3ayr901968vxmobirT9Pw4dj+OMVwm671ORUlOvr4lMPUEFUHh9nVNAAAAAAAAA== -------=_Part_1_1464954728.1480403996634-- +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 +Xhy/njAAAAAAAAA= +------=_Part_211_306083396.1641304626706-- diff --git a/pyas2lib/tests/fixtures/mecas2_signed_encrypted.as2 b/pyas2lib/tests/fixtures/mecas2_signed_encrypted.as2 index fb7e0ad..a1053a2 100644 Binary files a/pyas2lib/tests/fixtures/mecas2_signed_encrypted.as2 and b/pyas2lib/tests/fixtures/mecas2_signed_encrypted.as2 differ diff --git a/pyas2lib/tests/livetest_with_mecas2.py b/pyas2lib/tests/livetest_with_mecas2.py index 12649da..11b1ef6 100644 --- a/pyas2lib/tests/livetest_with_mecas2.py +++ b/pyas2lib/tests/livetest_with_mecas2.py @@ -44,7 +44,7 @@ def test_compressed_message(self): for k, v in response.headers.items(): raw_mdn += "{}: {}\n".format(k, v) - raw_mdn = raw_mdn + "\n" + response.text + raw_mdn = (raw_mdn + "\n").encode("utf-8") + response.content out_mdn = as2.Mdn() status, detailed_status = out_mdn.parse( @@ -68,7 +68,7 @@ def test_encrypted_message(self): for k, v in response.headers.items(): raw_mdn += "{}: {}\n".format(k, v) - raw_mdn = raw_mdn + "\n" + response.text + raw_mdn = (raw_mdn + "\n").encode("utf-8") + response.content out_mdn = as2.Mdn() status, detailed_status = out_mdn.parse( @@ -92,7 +92,7 @@ def test_signed_message(self): raw_mdn = "" for k, v in response.headers.items(): raw_mdn += "{}: {}\n".format(k, v) - raw_mdn = raw_mdn + "\n" + response.text + raw_mdn = (raw_mdn + "\n").encode("utf-8") + response.content out_mdn = as2.Mdn() status, detailed_status = out_mdn.parse( @@ -117,7 +117,7 @@ def test_encrypted_signed_message(self): raw_mdn = "" for k, v in response.headers.items(): raw_mdn += "{}: {}\n".format(k, v) - raw_mdn = raw_mdn + "\n" + response.text + raw_mdn = (raw_mdn + "\n").encode("utf-8") + response.content out_mdn = as2.Mdn() status, detailed_status = out_mdn.parse( @@ -143,7 +143,7 @@ def test_encrypted_signed_compressed_message(self): raw_mdn = "" for k, v in response.headers.items(): raw_mdn += "{}: {}\n".format(k, v) - raw_mdn = raw_mdn + "\n" + response.text + raw_mdn = (raw_mdn + "\n").encode("utf-8") + response.content out_mdn = as2.Mdn() status, detailed_status = out_mdn.parse( diff --git a/pyas2lib/tests/test_with_mecas2.py b/pyas2lib/tests/test_with_mecas2.py index 19ab743..4c4d3de 100644 --- a/pyas2lib/tests/test_with_mecas2.py +++ b/pyas2lib/tests/test_with_mecas2.py @@ -64,7 +64,7 @@ def test_signed_message(self): # Compare the mic contents of the input and output messages self.assertTrue(in_message.signed) - self.assertEqual(in_message.digest_alg, "sha1") + self.assertEqual(in_message.digest_alg, "sha256") self.assertEqual(self.test_data, in_message.content) def test_encrypted_signed_message(self): @@ -82,7 +82,7 @@ def test_encrypted_signed_message(self): self.assertTrue(in_message.encrypted) self.assertEqual(in_message.enc_alg, "tripledes_192_cbc") self.assertTrue(in_message.signed) - self.assertEqual(in_message.digest_alg, "sha1") + self.assertEqual(in_message.digest_alg, "sha256") self.assertEqual(self.test_data, in_message.content) def test_encrypted_signed_compressed_message(self): @@ -100,7 +100,7 @@ def test_encrypted_signed_compressed_message(self): self.assertTrue(in_message.encrypted) self.assertEqual(in_message.enc_alg, "tripledes_192_cbc") self.assertTrue(in_message.signed) - self.assertEqual(in_message.digest_alg, "sha1") + self.assertEqual(in_message.digest_alg, "sha256") self.assertEqual(self.test_data, in_message.content) def test_unsigned_mdn(self):