diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-06-26 19:23:36 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-06-26 19:23:36 +0200 |
| commit | 492d3de2eaceb836105c8ef747797b5979f5bbb0 (patch) | |
| tree | c96c5223baccf6835391eadf43082b5e6a6e4139 | |
| parent | 5b02d5417ab48ec65ee51b2b04bfc15643a5bad0 (diff) | |
| parent | 26ea1a065e1648029a1eed578c18113e47f093f9 (diff) | |
| download | mitmproxy-492d3de2eaceb836105c8ef747797b5979f5bbb0.tar.gz mitmproxy-492d3de2eaceb836105c8ef747797b5979f5bbb0.tar.bz2 mitmproxy-492d3de2eaceb836105c8ef747797b5979f5bbb0.zip | |
Merge branch 'master' into appveyor
| -rw-r--r--[l---------] | test/data/verificationcerts/8117bdb9.0 | 16 | ||||
| -rw-r--r--[l---------] | test/data/verificationcerts/9d45e6a9.0 | 16 |
2 files changed, 30 insertions, 2 deletions
diff --git a/test/data/verificationcerts/8117bdb9.0 b/test/data/verificationcerts/8117bdb9.0 index 2f34cfaa..8ebc0e5c 120000..100644 --- a/test/data/verificationcerts/8117bdb9.0 +++ b/test/data/verificationcerts/8117bdb9.0 @@ -1 +1,15 @@ -trusted.pem
\ No newline at end of file +# Self signed +-----BEGIN CERTIFICATE----- +MIICJzCCAZACCQCo1BdopddN/TANBgkqhkiG9w0BAQUFADBXMQswCQYDVQQGEwJB +VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0 +cyBQdHkgTHRkMRAwDgYDVQQDEwdUUlVTVEVEMCAXDTE1MDYxOTE4MDEzMVoYDzIx +MTUwNTI2MTgwMTMxWjBXMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0 +ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRAwDgYDVQQDEwdU +UlVTVEVEMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC00Jf3KrBAmLQWl+Dz +8Qrig8ActB94kv0/Lu03P/2DwOR8kH2h3w4OC3b3CFKX31h7hm/H1PPHq7cIX6IR +fwrYCtBE77UbxklSlrwn06j6YSotz0/dwLEQEFDXWITJq7AyntaiafDHazbbXESN +m/+I/YEl2wKemEHE//qWbeM9kwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAF0NREP3 +X+fTebzJGttzrFkDhGVFKRNyLXblXRVanlGOYF+q8grgZY2ufC/55gqf+ub6FRT5 +gKPhL4V2rqL8UAvCE7jq8ujpVfTB8kRAKC675W2DBZk2EJX9mjlr89t7qXGsI5nF +onpfJ1UtiJshNoV7h/NFHeoag91kx628807n +-----END CERTIFICATE----- diff --git a/test/data/verificationcerts/9d45e6a9.0 b/test/data/verificationcerts/9d45e6a9.0 index 2f34cfaa..8ebc0e5c 120000..100644 --- a/test/data/verificationcerts/9d45e6a9.0 +++ b/test/data/verificationcerts/9d45e6a9.0 @@ -1 +1,15 @@ -trusted.pem
\ No newline at end of file +# Self signed +-----BEGIN CERTIFICATE----- +MIICJzCCAZACCQCo1BdopddN/TANBgkqhkiG9w0BAQUFADBXMQswCQYDVQQGEwJB +VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0 +cyBQdHkgTHRkMRAwDgYDVQQDEwdUUlVTVEVEMCAXDTE1MDYxOTE4MDEzMVoYDzIx +MTUwNTI2MTgwMTMxWjBXMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0 +ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRAwDgYDVQQDEwdU +UlVTVEVEMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC00Jf3KrBAmLQWl+Dz +8Qrig8ActB94kv0/Lu03P/2DwOR8kH2h3w4OC3b3CFKX31h7hm/H1PPHq7cIX6IR +fwrYCtBE77UbxklSlrwn06j6YSotz0/dwLEQEFDXWITJq7AyntaiafDHazbbXESN +m/+I/YEl2wKemEHE//qWbeM9kwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAF0NREP3 +X+fTebzJGttzrFkDhGVFKRNyLXblXRVanlGOYF+q8grgZY2ufC/55gqf+ub6FRT5 +gKPhL4V2rqL8UAvCE7jq8ujpVfTB8kRAKC675W2DBZk2EJX9mjlr89t7qXGsI5nF +onpfJ1UtiJshNoV7h/NFHeoag91kx628807n +-----END CERTIFICATE----- |