summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2017-11-07Merge branch '2.1' into 2.2Jeff Forcier
2017-11-07Merge branch '2.0' into 2.1Jeff Forcier
2017-11-07Limit dev-requirements to python 2.6 compat versions.Jeff Forcier
This should only apply to 1.17-2.3; 2.4 drops python 2.6
2017-11-07Merge branch '2.1' into 2.2Jeff Forcier
2017-11-07Merge branch '2.0' into 2.1Jeff Forcier
2017-11-07Add Python 3.7-dev to Travis matrix. Why not?Jeff Forcier
2017-11-07Merge branch '2.1' into 2.2Jeff Forcier
2017-11-07Merge branch '2.0' into 2.1Jeff Forcier
2017-11-07Changelog re #1108Jeff Forcier
[ci skip]
2017-11-07Rename an internal-only 'async' method kwarg for Python 3.7 compatibility.Jeff Forcier
Fixes #1108
2017-10-18Merge branch '2.1' into 2.2Jeff Forcier
2017-10-18Merge branch '2.0' into 2.1Jeff Forcier
2017-10-18Include LICENSE in wheelsJeff Forcier
2017-10-10Merge branch '2.1' into 2.2Jeff Forcier
2017-10-10Merge branch '2.0' into 2.1Jeff Forcier
2017-10-10TypofixJeff Forcier
2017-09-26Merge branch '2.1' into 2.2Jeff Forcier
2017-09-26Merge branch '2.0' into 2.1Jeff Forcier
2017-09-26sftp: fix BytesWarning: str() on a bytes instanceMichal Reznik
when running the code with python3 we get BytesWarning as what we receive from hexlify() function is bytes. Use u() from py3compat to overcome the issue. Fix: https://github.com/paramiko/paramiko/issues/1074
2017-09-18Merge branch '2.1' into 2.2Jeff Forcier
2017-09-18Merge branch '2.0' into 2.1Jeff Forcier
2017-09-18Note that #945 is 1.18+Jeff Forcier
Also pulls in 1.17, 1.18 specific entries to the 2.x line. FML
2017-09-18Fix incorrect changelog branch stuff.Jeff Forcier
Really starting to think we oughtta just move to one changelog file per major family :(
2017-09-18Cut 2.2.2Jeff Forcier
2017-09-18Merge branch '2.1' into 2.2Jeff Forcier
2017-09-18Cut 2.1.4Jeff Forcier
2017-09-18Merge branch '2.1' into 2.2Jeff Forcier
2017-09-18Merge branch '2.0' into 2.1Jeff Forcier
2017-09-18Need new twine for newer pypiJeff Forcier
2017-09-18Cut 2.0.7Jeff Forcier
2017-09-18Merge branch '2.1' into 2.2Jeff Forcier
2017-09-18Merge branch '2.0' into 2.1Jeff Forcier
2017-09-18Merge branch '2.0' of github.com:paramiko/paramiko into 2.0Jeff Forcier
2017-09-18Migrate changelog release entry from 1.18Jeff Forcier
2017-09-18Changelog re #1065Jeff Forcier
2017-09-18Fix rekeying with GSS-API key exchangeSebastian Deiss
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.
2017-09-12Merge branch '2.0' into 2.1Jeff Forcier
2017-09-12Merge branch '2.1' into 2.2Jeff Forcier
2017-09-12Changelog re #1061Jeff Forcier
2017-09-12Merge branch '2.0' into 1061-intJeff Forcier
2017-09-12demo_simple: gss_auth and gss_kex are independent of each other.Anselm Kruis
2017-09-12Changelog re #1060Jeff Forcier
2017-09-12Merge branch '2.0' into 1060-intJeff Forcier
2017-09-12Merge branch '2.1' into 2.2Jeff Forcier
2017-09-12Master changelog entry re: #1056 #1057 #1058 #1059Jeff Forcier
2017-09-12Merge branch '2.0' into 2.1Jeff Forcier
2017-09-12Master changelog entry re: #1056 #1057 #1058 #1059Jeff Forcier
2017-09-12Pep8 and Sphinx fixes.Anselm Kruis
2017-08-04Transport gssapi-keyex: set the gss_kex_used flag lateAnselm Kruis
Set the flag gss_kex_used only after a gssapi-keyex has been successfully completed. This change prevents a wrong value in case of exceptions during the gssapi-keyex handshake.
2017-08-04Merge branch '2.1-gsskex-hostkeycheck-fix' into 2.2-gsskex-hostkeycheck-fixAnselm Kruis