Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '2.1' into 2.2 | Jeff Forcier | 2018-03-12 | 1 | -5/+50 |
|\ | |||||
| * | Merge branch '2.0' into 2.1 | Jeff Forcier | 2018-03-12 | 1 | -5/+50 |
| |\ | |||||
| | * | Initial tests proving CVE-2018-7750 / #XXX | Jeff Forcier | 2018-03-12 | 1 | -2/+40 |
| | | | |||||
| | * | Allow overriding test client connect kwargs in Transport test suite | Jeff Forcier | 2018-03-12 | 1 | -3/+10 |
| | | | |||||
* | | | Test proving #1039 / efficacy of #1051 | Jeff Forcier | 2017-11-29 | 1 | -0/+10 |
| | | | |||||
* | | | Fix rekeying with GSS-API key exchange | Sebastian Deiss | 2017-09-18 | 1 | -2/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | When GSS-API key exchange is used a rekey caused a GSS-API MIC failure and closed the transport. This happened because the MIC of the transport session ID (H of the initial kex) was checked against the MIC of the new H created during rekey. | ||||
* | | | Merge branch '2.1' into 2.2 | Jeff Forcier | 2017-09-12 | 1 | -7/+38 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2017-09-12 | 1 | -7/+38 |
| |\ \ | | |/ | |||||
| | * | Merge branch '2.0' into 1061-int | Jeff Forcier | 2017-09-12 | 1 | -0/+61 |
| | |\ | |||||
| | * | | AuthHandler: fix the server-mode "gssapi-with-mic" logic | Anselm Kruis | 2017-08-04 | 1 | -7/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A paramiko server is now able to handle a restart of the user authentication during the GSS-API token exchange. This may occur, if the client detects a local GSSAPI problem (e.g. a missing kerberos ticket) and continues with another authentication method. The added test case test_2_auth_trickledown still fails, because the paramiko client contains a bug too. | ||||
* | | | | Merge branch '2.1-gsskex-hostkeycheck-fix' into 2.2-gsskex-hostkeycheck-fix | Anselm Kruis | 2017-08-04 | 1 | -0/+61 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '2.0-gsskex-hostkeycheck-fix' into 2.1-gsskex-hostkeycheck-fix | Anselm Kruis | 2017-08-04 | 1 | -0/+61 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | SSHClient: fix the host key test | Anselm Kruis | 2017-08-04 | 1 | -0/+61 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | Skip the host key check only, if the transport actually used gssapi-keyex. Add tests for the missing-host-key RejectPolicy. Before this change, a man-in-the-middle attack on the paramiko ssh client with gss_kex=True was possible by having a server that does not support gssapi-keyex and gives any or no host key. | ||||
* | | | Whitespace | Jeff Forcier | 2017-06-13 | 1 | -1/+0 |
| | | | |||||
* | | | implement __hash__() method for Ed25519Key | Pierce Lopez | 2017-06-13 | 1 | -1/+10 |
| | | | | | | | | | | | | makes Ed25519Key objs comparable, needed for host keys | ||||
* | | | Merge branch '2.1' | Jeff Forcier | 2017-06-09 | 1 | -4/+56 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '2.1' into 910-int | Jeff Forcier | 2017-06-09 | 5 | -19/+188 |
| |\ \ | |||||
| * | | | tests for host key negotiation when there are multiple | Pierce Lopez | 2017-06-07 | 1 | -4/+56 |
| | | | | |||||
* | | | | Merge branch '2.1' | Jeff Forcier | 2017-06-09 | 4 | -10/+182 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2017-06-09 | 5 | -11/+183 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Flake8/etc tweaks re #971 in 2.x | Jeff Forcier | 2017-06-09 | 1 | -1/+1 |
| | | | | |||||
| | * | | Allow any buffer type to be written to SFTPFile | Martin Packman | 2017-06-09 | 1 | -0/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #967 #968 Rollup of earlier branches proposed as #969 and #970 with additional fix inside sftp_client. Includes new tests for SFTPFile usage. Change against the 1.17 branch. | ||||
| | * | | Allow any buffer type to be sent to Channel | Martin Packman | 2017-06-09 | 1 | -0/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #968 Changes the behaviour of the underlying asbytes helper to pass along unknown types. Most callers already handle this by passing the bytes along to a file or socket-like object which will raise TypeError anyway. Adds test coverage through the Transport implementation. Change against the 1.17 branch. | ||||
| | * | | Import from py3compat directly in test_client | Martin Packman | 2017-06-09 | 1 | -1/+1 |
| | | | | |||||
| | * | | Allow any buffer type to written to BufferedFile | Martin Packman | 2017-06-09 | 1 | -10/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #967 Also adds test coverage for writing various types to BufferedFile which required some small changes to the test LoopbackFile subclass. Change against the 1.17 branch. | ||||
| | * | | Add new skipUnlessBuiltin function for testing | Martin Packman | 2017-06-09 | 1 | -0/+36 |
| | | | | |||||
* | | | | Merge branch '2.1' | Jeff Forcier | 2017-06-09 | 1 | -8/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2017-06-09 | 1 | -8/+5 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | Merge branch '2.0' into 952-int | Jeff Forcier | 2017-06-09 | 2 | -0/+37 |
| | |\ | |||||
| | * | | re-enable client cleanup test for python3 | Pierce Lopez | 2017-06-02 | 1 | -8/+5 |
| | | | | |||||
* | | | | Merge pull request #988 from ploxiln/auth_timeout_tests_cleanup | Jeff Forcier | 2017-06-07 | 2 | -25/+13 |
|\ \ \ \ | | | | | | | | | | | cleanup/simplify auth_timeout tests | ||||
| * | | | | cleanup/simplify auth_timeout tests | Pierce Lopez | 2017-06-07 | 2 | -25/+13 |
| | | | | | |||||
* | | | | | Missed a merge conflict lolol | Jeff Forcier | 2017-06-06 | 1 | -4/+0 |
| | | | | | |||||
* | | | | | Merge branch '2.1' | Jeff Forcier | 2017-06-06 | 1 | -0/+39 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2017-06-06 | 1 | -0/+28 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Hand-picked backport of #912, fixes #741 | Jeff Forcier | 2017-06-06 | 1 | -0/+28 |
| | | | | | |||||
* | | | | | Merge branch 'master' into 471-int | Jeff Forcier | 2017-06-06 | 25 | -159/+896 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'master' into 869-int | Jeff Forcier | 2017-06-06 | 14 | -34/+168 |
| |\ \ \ \ | |||||
| | * | | | | Failing test proving need for #857 | Jeff Forcier | 2017-06-06 | 1 | -0/+17 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into 951-int | Jeff Forcier | 2017-06-06 | 11 | -28/+77 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch '2.1' | Jeff Forcier | 2017-06-05 | 1 | -0/+9 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2017-06-05 | 1 | -0/+9 |
| | | | |\ \ \ | | | | | |/ / | |||||
| | | | | * | | test transport security options can be set to defaults | Pierce Lopez | 2017-06-05 | 1 | -0/+9 |
| | | | | |/ | | | | | | | | | | | | | | | | | | | ensures all defaults key/cipher/digest etc types are supported | ||||
| | | * | | | Fixed encoding/decoding of the public key on the wire | Alex Gaynor | 2017-06-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Public point was accidentally encoded as 32 bytes, with no length prefix. | ||||
| | | * | | | integration test, with ourselves | Alex Gaynor | 2017-06-03 | 1 | -0/+4 |
| | | | | | | |||||
| | | * | | | py3k | Alex Gaynor | 2017-06-03 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Support decrypting keys | Alex Gaynor | 2017-06-03 | 3 | -9/+26 |
| | | |/ / | |||||
| | | * | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2017-06-01 | 2 | -3/+13 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Test & impl for truly functional HostKeys.__delitem__ | Jeff Forcier | 2017-06-01 | 1 | -0/+12 |
| | | | | | |||||
| | | | * | Remove unused value from demo/test. | Jeff Forcier | 2017-06-01 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | Honestly not sure WTF |