diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-03-12 01:17:40 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-12 01:17:40 +0100 |
| commit | a3107474f9f336f28dc195f1406a4e035aa51c84 (patch) | |
| tree | 9ab9e73fb8506879dad35d6269d71fc468ddd5d9 /netlib/certutils.py | |
| parent | 4bd15a28b73f521fc08ea77512198faffeaaa247 (diff) | |
| parent | 34e469eb558cae999b13510b029714a31d9dd1f3 (diff) | |
| download | mitmproxy-a3107474f9f336f28dc195f1406a4e035aa51c84.tar.gz mitmproxy-a3107474f9f336f28dc195f1406a4e035aa51c84.tar.bz2 mitmproxy-a3107474f9f336f28dc195f1406a4e035aa51c84.zip | |
Merge pull request #31 from mitmproxy/fix_dhparam_gen
create dhparam file if it doesn't exist, fix mitmproxy/mitmproxy#235
Diffstat (limited to 'netlib/certutils.py')
| -rw-r--r-- | netlib/certutils.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/netlib/certutils.py b/netlib/certutils.py index 92b219ee..ebe643e4 100644 --- a/netlib/certutils.py +++ b/netlib/certutils.py @@ -123,6 +123,13 @@ class CertStore: @classmethod def load_dhparam(klass, path): + + # netlib<=0.10 doesn't generate a dhparam file. + # Create it now if neccessary. + if not os.path.exists(path): + with open(path, "wb") as f: + f.write(DEFAULT_DHPARAM) + bio = OpenSSL.SSL._lib.BIO_new_file(path, b"r") if bio != OpenSSL.SSL._ffi.NULL: bio = OpenSSL.SSL._ffi.gc(bio, OpenSSL.SSL._lib.BIO_free) |