aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #42 from mitmproxy/streamMaximilian Hils2014-07-312-63/+126
|\
| * Merge branch 'master' into streamMaximilian Hils2014-07-214-79/+115
| |\
| * | refactor response length handlingMaximilian Hils2014-07-212-175/+107
| * | added some additional functions for dealing with chunks - needed for mitmprox...Brad Peabody2014-07-172-1/+132
* | | Merge pull request #44 from kronick/masterMaximilian Hils2014-07-311-1/+4
|\ \ \ | |_|/ |/| |
| * | Made attribute optional (as it is in pyOpenSSL)kronick2014-07-291-1/+4
|/ /
* | certstore: add support for asterisk form to DNTree replacementMaximilian Hils2014-07-191-1/+18
* | fix testsMaximilian Hils2014-07-181-1/+1
* | temporarily replace DNTree with a simpler cert lookup mechanism, fix mitmprox...Maximilian Hils2014-07-182-75/+82
* | add test case for mitmproxy/mitmproxy#295Maximilian Hils2014-07-172-1/+8
* | improve docsMaximilian Hils2014-07-141-5/+10
* | Merge pull request #40 from bradleypeabody/masterMaximilian Hils2014-07-142-4/+14
|\|
| * added option for read_response to only read the headers, beginnings of implem...Brad Peabody2014-07-122-4/+14
|/
* mark nsCertType non-critical, fix #39Maximilian Hils2014-06-291-1/+1
* socks: 100% test coverageMaximilian Hils2014-06-251-2/+26
* fix overly restrictive testsMaximilian Hils2014-06-251-1/+1
* remove ntop windows workaroundMaximilian Hils2014-06-254-45/+11
* socks module: polish, add testsMaximilian Hils2014-06-252-43/+83
* add inet_ntop/inet_pton functionsMaximilian Hils2014-06-253-4/+45
* add socks moduleMaximilian Hils2014-06-251-0/+142
* add support for ctx.load_verify_locations, refs mitmproxy/mitmproxy#174Maximilian Hils2014-05-211-2/+4
* properly subclass Exception in HTTPErrorMaximilian Hils2014-05-151-6/+6
* make cert and key mandatoryMaximilian Hils2014-05-151-2/+2
* extract cert creation to be accessible in handle_sni callbacksMaximilian Hils2014-05-151-4/+11
* Update certutils.pyMaximilian Hils2014-04-251-1/+1
* make error message example less abstract.Maximilian Hils2014-03-311-1/+1
* Merge pull request #35 from droope/patch-1Maximilian Hils2014-03-311-1/+2
|\
| * Instead of removing the error, for consistency, leaving the error as-wasPedro Worcel2014-03-311-3/+2
| * Change error into awesome user-friendlynessPedro Worcel2014-03-301-1/+3
|/
* Merge pull request #31 from mitmproxy/fix_dhparam_genMaximilian Hils2014-03-121-0/+7
|\
| * create dhparam file if it doesn't exist, fix mitmproxy/mitmproxy#235Maximilian Hils2014-03-111-0/+7
|/
* fix #28Maximilian Hils2014-03-103-2/+27
* Certificate flagsAldo Cortesi2014-03-105-57/+130
* Support Ephemeral Diffie-HellmanAldo Cortesi2014-03-075-11/+56
* CertStore: cope with certs that have no common nameAldo Cortesi2014-03-051-3/+4
* Handler convert_to_ssl now takes a key object, not a path.Aldo Cortesi2014-03-052-3/+7
* Much more sophisticated certificate storeAldo Cortesi2014-03-052-15/+140
* Beef up CertStore, add DH params.Aldo Cortesi2014-03-042-97/+99
* We now require PyOpenSSL >= 0.14Aldo Cortesi2014-03-022-4/+1
* Use PyOpenSSL's underlying ffi interface to get current cipher for connections.Aldo Cortesi2014-03-022-4/+47
* Re-add state operations to ODict.Aldo Cortesi2014-03-022-0/+19
* Cleanups, tests, and no-cover directives for code sections we can't test.Aldo Cortesi2014-03-024-21/+25
* Minor improvement to CertStore interfaceAldo Cortesi2014-03-022-10/+9
* Cipher suite selection for client connections, improved error handlingAldo Cortesi2014-02-272-4/+47
* Merge branch 'master' of ssh.github.com:cortesi/netlibAldo Cortesi2014-02-263-5/+8
|\
| * allow super() on TCPServer, add thread names for better debuggingMaximilian Hils2014-02-152-4/+7
| * Bump versionMaximilian Hils2014-02-111-1/+1
* | Add an explicit license file.Aldo Cortesi2014-02-261-0/+19
|/
* Merge branch 'tcp_proxy'Aldo Cortesi2014-02-077-113/+144
|\
| * adjust netlib.wsgi to reflect changes in mitmproxys flow formatMaximilian Hils2014-02-053-6/+12