casa-mp-base

From 1b6a8d6acd3d70f9b9627ad4ae9def08103f8250 Mon Sep 17 00:00:00 2001

From: Maximilian Hils <git@maximilianhils.com>

Date: Fri, 7 Sep 2018 10:24:28 +0200

Subject: [PATCH] fix #3316

​

---

 test/mitmproxy/data/servercert/9da13359.0     | 32 +++----

 test/mitmproxy/data/servercert/generate.py    | 13 +++

 .../mitmproxy/data/servercert/self-signed.pem | 92 +++++++++---------

 .../data/servercert/trusted-leaf.pem          | 90 ++++++++---------

 .../data/servercert/trusted-root.pem          | 96 +++++++++----------

 .../net/data/verificationcerts/9da13359.0     | 32 +++----

 .../net/data/verificationcerts/generate.py    |  6 +-

 .../data/verificationcerts/self-signed.crt    | 34 +++----

 .../data/verificationcerts/self-signed.key    | 50 +++++-----

 .../data/verificationcerts/trusted-leaf.crt   | 28 +++---

 .../data/verificationcerts/trusted-leaf.key   | 50 +++++-----

 .../data/verificationcerts/trusted-root.crt   | 32 +++----

 .../data/verificationcerts/trusted-root.key   | 50 +++++-----

 .../data/verificationcerts/trusted-root.srl   |  2 +-

 14 files changed, 310 insertions(+), 297 deletions(-)

 create mode 100644 test/mitmproxy/data/servercert/generate.py

​

diff --git test/mitmproxy/data/servercert/9da13359.0 test/mitmproxy/data/servercert/9da13359.0

index b22e4d20d..5868a304d 100644

--- test/mitmproxy/data/servercert/9da13359.0

+++ test/mitmproxy/data/servercert/9da13359.0

@@ -1,21 +1,21 @@

 -----BEGIN CERTIFICATE-----

-MIIDXTCCAkWgAwIBAgIJAPAfPQGCV/Z4MA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV

+MIIDXTCCAkWgAwIBAgIJALzkvKyFAwWYMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV

 BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX

-aWRnaXRzIFB0eSBMdGQwHhcNMTUxMTAxMTY0ODAxWhcNMTgwODIxMTY0ODAxWjBF

+aWRnaXRzIFB0eSBMdGQwHhcNMTgwOTA3MDgyMjUxWhcNMzgwOTAyMDgyMjUxWjBF

 MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50

 ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB

-CgKCAQEArp8LD34JhKCwcQbwIYQMg4+eCgLVN8fwB7+/qOfJbArPs0djFBN+F7c6

-HGvMr24BKUk5u8pn4dPtNurm/vPC8ovNGmcXz62BQJpcMX2veVdRsF7yNwhNacNJ

-Arq+70zNMwYBznx0XUxMF6j6nVFf3AW6SU04ylT4Mp3SY/BUUDAdfl1eRo0mPLNS

-8rpsN+8YBw1Q7SCuBRVqpOgVIsL88svgQUSOlzvMZPBpG/cmB3BNKNrltwb5iFEI

-1jAV7uSj5IcIuNO/246kfsDVPTFMJIzav/CUoidd5UNw+SoFDlzh8sA7L1Bm7D1/

-3KHYSKswGsSR3kynAl10w/SJKDtn8wIDAQABo1AwTjAdBgNVHQ4EFgQUgOcrtxBX

-LxbpnOT65d+vpfyWUkgwHwYDVR0jBBgwFoAUgOcrtxBXLxbpnOT65d+vpfyWUkgw

-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAEE9bFmUCA+6cvESKPoi2

-TGSpV652d0xd2U66LpEXeiWRJFLz8YGgoJCx3QFGBscJDXxrLxrBBBV/tCpEqypo

-pYIqsawH7M66jpOr83Us3M8JC2eFBZJocMpXxdytWqHik5VKZNx6VQFT8bS7+yVC

-VoUKePhlgcg+pmo41qjqieBNKRMh/1tXS77DI1lgO5wZLVrLXcdqWuDpmaQOKJeq

-G/nxytCW/YJA7bFn/8Gjy8DYypJSeeaKu7o3P3+ONJHdIMHb+MdcheDBS9AOFSeo

-xI0D5EbO9F873O77l7nbD7B0X34HFN0nGczC4poexIpbDFG3hAPekwZ5KC6VwJLc

-1Q==

+CgKCAQEAkvT4Y1ML8Gg4x5aFVygIW022tJsEyfuW4HsEvIarAGpFtUNkw0dOoAxv

+Gv71I0KAWOXxtc9DUjtq7ZXJcG+dBiheTYJ40lrYhHvUt7J37nrUF5v5trQzoE9I

+6WGtzTV8C8RI6F+M6GtwxgwRBgqkuXiK5ExPXAjGMMJZWtiEXHxGTNB6F4zy884m

+VjVtQi8jy+c5g21Awp3z5HrQLM210zwvgi7Rygk6/UM0AnmST4o32SqFSd+0MFUJ

+f3pH3xczfKmhU/TBoVEWRB1YzwixsJrzDOB8wOGnNKCsl45hYUJZZ8epVkyrvFZQ

+iMkwIqqBJbkU6H7fZBl68TJ8ascUCQIDAQABo1AwTjAdBgNVHQ4EFgQUkurgHlw1

+xMP2wrsrGPTk0ofxCyowHwYDVR0jBBgwFoAUkurgHlw1xMP2wrsrGPTk0ofxCyow

+DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAcdExVlSvH6aVExNiQO3k

+cMamj+78woDn9x563vwzaGP24KvOXk1B/IJp5kqu3ZsXS0I0Mz6xwXHAXeuxaj06

+cKgEpHKKgClLblXo2zWqo/3V1UFFpOVP/NhI3r21b+fPrS46rP0mw75haQCph8/8

+buQr0OeAYbElliY/ji+cJiCJB8A/D13fUMV/NUUfPW/UE6497jOmz+6PtZNAoOFx

+evrmDcbCzbJxacyLJX04rsrt6DO09jb/+5lFm5Aqr6ySKasrmheIGEisl4o9Zbuy

+5PvYgbOEmFgPATIiWGpBO/rqwDdsmgyYFl+YfFoW0akXUVhDb2e5iRDx6Rs0fmN/

+NA==

 -----END CERTIFICATE-----

diff --git test/mitmproxy/data/servercert/generate.py test/mitmproxy/data/servercert/generate.py

new file mode 100644

index 000000000..604912679

--- /dev/null

+++ test/mitmproxy/data/servercert/generate.py

@@ -0,0 +1,13 @@

+import pathlib

+import shutil

+

+src = pathlib.Path("../../net/data/verificationcerts")

+here = pathlib.Path(".")

+

+shutil.copy(src / "9da13359.0", "9da13359.0")

+

+for x in ["self-signed", "trusted-leaf", "trusted-root"]:

+    (here / f"{x}.pem").write_text(

+        (src / f"{x}.crt").read_text() +

+        (src / f"{x}.key").read_text()

+    )

diff --git test/mitmproxy/data/servercert/self-signed.pem test/mitmproxy/data/servercert/self-signed.pem

index cd066a243..d35284bda 100644

--- test/mitmproxy/data/servercert/self-signed.pem

+++ test/mitmproxy/data/servercert/self-signed.pem

@@ -1,46 +1,46 @@

------BEGIN CERTIFICATE-----

-MIIDEzCCAfugAwIBAgIJAJ945xt1FRsfMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV