From 448574f3c46d4aa761172321e2db46f43bcf5a89 Mon Sep 17 00:00:00 2001 From: jywsn Date: Thu, 24 Sep 2015 10:33:33 -0500 Subject: [PATCH] Use adhoc ssl context instead of bogus self-signed certificate --- requirements.txt | 2 ++ website/app.py | 5 +---- website/website.crt | 14 -------------- website/website.key | 15 --------------- 4 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 website/website.crt delete mode 100644 website/website.key diff --git a/requirements.txt b/requirements.txt index 7e673e9..4c5067a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,3 +10,5 @@ ply==3.4 pycrypto==2.6 wsgiref==0.1.2 python-magic==0.4.6 +pyOpenSSL==0.15.1 + diff --git a/website/app.py b/website/app.py index d84ebe2..5ca138e 100644 --- a/website/app.py +++ b/website/app.py @@ -92,10 +92,7 @@ if __name__ == "__main__": opts, args = getopt.getopt(sys.argv[1:], "sp:", ["port="]) for opt, arg in opts: if opt == '-s': - ssl_context = ( - os.path.join(site_dir, 'website.crt'), - os.path.join(site_dir, 'website.key')) - + ssl_context = 'adhoc' elif opt in ('-p', '--port'): port = int(arg) else: diff --git a/website/website.crt b/website/website.crt deleted file mode 100644 index 3113fdd..0000000 --- a/website/website.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICITCCAYoCCQCgqlz74c2iMDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJV -UzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoT -GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0xNTA1MDYyMTEyMzlaFw0xNjA1 -MDUyMTEyMzlaMFUxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhJbGxpbm9pczEQMA4G -A1UEBxMHQ2hpY2FnbzEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRk -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCZhBs/JwRKFVUBGWvormOGFR1T -8iyY2uskuNxfDgLV0+HRbdCWJMZO1vMgWSZA1pBVtt9lC1gw04MtSinPmBGn11ku -ulJFRvFi+EjPBuXoBe1ZBp50pE7IfGL37URjP8ggWZKaABl7Znl8bEjBmbRG7Gfd -MMzc0tX4f8ojI4kvwQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBABwlQpzlKufrvCZc -jPFjOVcPjsGjHP0fBBoM7hfXvv3OYE5yeNhV5OcRg9WSE9QbyWkaYwmp9dMPhsOI -dmfg6QtelDd5zLxqT9mjnfWdpnMOvoFd3Mm0dXv5lhvw015iatA5nd98mUVG+GjS -F+0Kg8ePFb6ogjgKKslgnjroHI9x ------END CERTIFICATE----- diff --git a/website/website.key b/website/website.key deleted file mode 100644 index 17003fd..0000000 --- a/website/website.key +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQCZhBs/JwRKFVUBGWvormOGFR1T8iyY2uskuNxfDgLV0+HRbdCW -JMZO1vMgWSZA1pBVtt9lC1gw04MtSinPmBGn11kuulJFRvFi+EjPBuXoBe1ZBp50 -pE7IfGL37URjP8ggWZKaABl7Znl8bEjBmbRG7GfdMMzc0tX4f8ojI4kvwQIDAQAB -AoGBAJMKo2JxB73CAwKji+V6K9/BF69RdoAOqE4rNwFhFTwkz9Zenf1CSiQ35PZm -DarrGaLQH9fT7uwNnEbkE3pBCR7D3dqoswCmCTbTxn+jz7sFl8cvnjavT7NZyYy9 -uykc3x3+ykfdgA5t6L53iKBe4kN2tkMHoR943nfp3yI1zfeVAkEAyorbs1AjAEii -oul2SgoN6wNfnkVtSIrmoPngo5JnkY3eoPvZXer3ZyKleN32wLZAadJeSFXi0P2r -TNFZvVZq9wJBAMIIsXnVy1+wBOmNUX5c99FGZBRBAcoiuMvALKX02pHUiPm6hxlv -tKmdcqWPY/HaujDmJaIHnw0rmGdPoqxKFQcCQBbgPBQyluFvUr8nsy6FmDDU/rW3 -jbJFzeqcjlyrKntsFJsGFvTelvbVGO9f0oDNlNTe57svyCBmpjRU6NfTrN0CQQCd -IEsP/WhuuWyQ8MaQjJqGFvmOSUI4vTtmi93cGlcxBqpRiJJEr+fd/slLdr2ZqeVj -GcxZ1NAg6y/EYYG7AVbbAkBfqs83kcYA/NJajh+xjq40An1033p9ZIvNRRoYfmia -wF3LJkTXoUC+IE/bRHljeau74TlozVOWFfo0qlV1atuF ------END RSA PRIVATE KEY-----