Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge smurfix/ipv6, add ipv6 support for TCPServer, add ipv6 test | Maximilian Hils | 2013-12-13 | 4 | -10/+27 |
|\ | |||||
| * | tab fix | Matthias Urlichs | 2013-12-12 | 1 | -1/+1 |
| | | |||||
| * | support ipv6 | Matthias Urlichs | 2013-12-12 | 1 | -4/+4 |
| | | |||||
* | | add requirements.txt, small changes | Maximilian Hils | 2013-12-13 | 3 | -2/+8 |
| | | |||||
* | | add travis CI file | Maximilian Hils | 2013-12-13 | 1 | -0/+14 |
|/ | |||||
* | Bump version | Aldo Cortesi | 2013-12-10 | 1 | -1/+1 |
| | |||||
* | Fix race condition in test suite. | Aldo Cortesi | 2013-12-08 | 2 | -4/+0 |
| | |||||
* | fix AuthAction tests failures from last merge | Maximilian Hils | 2013-12-08 | 1 | -3/+4 |
| | |||||
* | merge origin/master | Maximilian Hils | 2013-12-08 | 11 | -74/+94 |
|\ | |||||
| * | Unit test auth actions. | Aldo Cortesi | 2013-12-08 | 2 | -10/+30 |
| | | |||||
| * | Domain checks for persistent cert store is now irrelevant. | Aldo Cortesi | 2013-12-08 | 3 | -25/+3 |
| | | | | | | | | | | We no longer store these on disk, so we don't care about path components. | ||||
| * | Zap stray print in tests. | Aldo Cortesi | 2013-12-08 | 1 | -1/+0 |
| | | |||||
| * | Merge pull request #19 from rouli/ciphersuites | Aldo Cortesi | 2013-12-07 | 3 | -2/+30 |
| |\ | | | | | | | adding cipher list selection option to BaseHandler | ||||
| | * | adding cipher list selection option to BaseHandler | Israel Nir | 2013-08-21 | 3 | -2/+30 |
| | | | |||||
| * | | Merge pull request #22 from fictivekin/custom-o-cn | Aldo Cortesi | 2013-12-07 | 1 | -6/+9 |
| |\ \ | | | | | | | | | allow specification of o, cn, expiry | ||||
| | * | | allow specification of o, cn, expiry | Sean Coates | 2013-10-07 | 1 | -6/+9 |
| | | | | |||||
| * | | | Merge branch 'fix_invalid_tcp_close' | Aldo Cortesi | 2013-12-08 | 6 | -33/+16 |
| |\ \ \ | |||||
| | * | | | Fix client certificate request feature. | Aldo Cortesi | 2013-12-08 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Merge branch 'fix_windows_bugs' into fix_invalid_tcp_close | Maximilian Hils | 2013-11-19 | 4 | -3/+7 |
| | |\ \ \ | |||||
| | | * | | | compatibility fixes for windows | Maximilian Hils | 2013-08-19 | 4 | -4/+5 |
| | | | | | | |||||
| | | * | | | fix windows bugs | Maximilian Hils | 2013-08-17 | 1 | -0/+3 |
| | | | |/ | | | |/| | |||||
| | * | | | attempt to fix #24 | Maximilian Hils | 2013-11-19 | 2 | -30/+9 |
| | | | | | |||||
| * | | | | Merge branch 'master' of ssh.github.com:cortesi/netlib | Aldo Cortesi | 2013-11-21 | 1 | -0/+44 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of ssh.github.com:cortesi/netlib | Aldo Cortesi | 2013-10-18 | 2 | -11/+4 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | Bump version. | Aldo Cortesi | 2013-08-25 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Handle interrupted system call errors. | Aldo Cortesi | 2013-08-25 | 1 | -1/+7 |
| | | | | | | |||||
* | | | | | | make AuthAction generic | Maximilian Hils | 2013-12-08 | 1 | -5/+5 |
| |_|/ / / |/| | | | | |||||
* | | | | | add custom argparse actions to seamlessly integrate ProxyAuth classes | Maximilian Hils | 2013-11-21 | 1 | -0/+44 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #23 from fictivekin/minor-cleanup | Maximilian Hils | 2013-10-07 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | remove tempfile and shutil imports because they're not actually used | ||||
| * | | | remove tempfile and shutil imports because they're not actually used | Sean Coates | 2013-10-07 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #21 from hackedd/patch-2 | Maximilian Hils | 2013-09-24 | 1 | -10/+2 |
|\ \ \ | |_|/ |/| | | Don't create a certificate request when creating a dummy cert | ||||
| * | | Don't create a certificate request when creating a dummy cert | Paul | 2013-09-24 | 1 | -10/+2 |
|/ / | |||||
* / | update gitignore to not include PyCharms | Maximilian Hils | 2013-08-17 | 1 | -0/+1 |
|/ | |||||
* | Revamp dummy cert generation. | Aldo Cortesi | 2013-08-12 | 4 | -46/+23 |
| | | | | We no longer use on-disk storage - we just keep the certs in memory. | ||||
* | Correct order of precedence for SSL errors. | Aldo Cortesi | 2013-08-11 | 1 | -2/+2 |
| | |||||
* | Better handling of cert errors. | Aldo Cortesi | 2013-08-10 | 1 | -0/+3 |
| | |||||
* | Clarify the interface for flush and close methods. | Aldo Cortesi | 2013-07-30 | 1 | -5/+5 |
| | |||||
* | Merge pull request #16 from mitmproxy/fix_socket_buffer | Aldo Cortesi | 2013-07-28 | 1 | -3/+12 |
|\ | | | | | attempt to fix 'half-duplex' TCP close sequence | ||||
| * | attempt to fix 'half-duplex' TCP close sequence | Maximilian Hils | 2013-06-17 | 1 | -3/+12 |
| | | |||||
* | | Merge pull request #17 from AndreyPlotnikov/master | Aldo Cortesi | 2013-07-22 | 1 | -1/+4 |
|\ \ | |/ |/| | Socket binding support for TCPClient | ||||
| * | Add socket binding support for TCPClient | Andrey Plotnikov | 2013-07-07 | 1 | -1/+4 |
|/ | |||||
* | Bump version. | Aldo Cortesi | 2013-06-16 | 1 | -1/+1 |
| | |||||
* | Merge pull request #15 from mhils/fix_binary_rw | Aldo Cortesi | 2013-06-15 | 2 | -12/+12 |
|\ | | | | | always read files in binary mode | ||||
| * | always read files in binary mode | Maximilian Hils | 2013-06-16 | 2 | -12/+12 |
| | | |||||
* | | Merge pull request #14 from mhils/commonname_invalid_chars | Aldo Cortesi | 2013-06-15 | 1 | -0/+1 |
|\ \ | |/ |/| | add test case for invalid characters in cert commonnames | ||||
| * | add test case for invalid characters in cert commonnames | Maximilian Hils | 2013-06-14 | 1 | -0/+1 |
|/ | |||||
* | Add MANIFEST.in | Aldo Cortesi | 2013-05-15 | 1 | -0/+4 |
| | |||||
* | Add a request_client_cert argument to server SSL conversion. | Aldo Cortesi | 2013-05-13 | 4 | -8/+24 |
| | | | | | | | | | | By default, we now do not request the client cert. We're supposed to be able to do this with no negative effects - if the client has no cert to present, we're notified and proceed as usual. Unfortunately, Android seems to have a bug (tested on 4.2.2) - when an Android client is asked to present a certificate it does not have, it hangs up, which is frankly bogus. Some time down the track we may be able to make the proper behaviour the default again, but until then we're conservative. | ||||
* | Fix exception hierarchy. | Aldo Cortesi | 2013-05-05 | 2 | -3/+3 |
| | |||||
* | Merge pull request #13 from a2800276/extension_set_version | Aldo Cortesi | 2013-04-19 | 1 | -0/+1 |
|\ | | | | | extensions aren't supported in v1, set to v3 (value=2) if using them. |