summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2015-10-15This adds SHA-256 support based on a fork of 'zamiam69:add_sha2_support'.gshaanan
This commit fixes the problem with the fork where you can't connect using SHA1 anymore. The fix changes the '_preferred_macs' and '_preferred_kex' order.
2014-11-25Merge upstream branch 'master' into add_sha2_supportMatthias Witte
Conflicts: paramiko/transport.py tests/test_transport.py
2014-11-12Merge branch '1.15'Jeff Forcier
2014-11-12Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: tests/test_util.py
2014-11-12Merge branch '1.13' into 1.14Jeff Forcier
2014-11-12Changelog re #429Jeff Forcier
2014-11-12Improve byte/string interactions in debug logging.Jeff Forcier
Fixes #429
2014-11-12Failing test proving #429Jeff Forcier
2014-10-02Merge branch '1.15'Jeff Forcier
2014-10-02Merge branch '1.14' into 1.15Jeff Forcier
2014-10-02Merge branch '1.13' into 1.14Jeff Forcier
2014-10-02Update documentation of lookup method.Olle Lundberg
The documentation reflected pre #93 behaviour.
2014-10-01Merge branch '1.15'Jeff Forcier
2014-10-01Merge branch '1.14' into 1.15Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-10-01Merge branch '1.13' into 1.14Jeff Forcier
2014-10-01Changelog re #320Jeff Forcier
Closes #409
2014-10-01Make sure we pass parameters as binary on windows.Olle Lundberg
This fixes #320 (thanks @adamkerz).
2014-09-22Merge branch '1.15'Jeff Forcier
Conflicts: sites/www/changelog.rst
2014-09-22Cut 1.15.1Jeff Forcier
2014-09-22Use keyword arguments for arguments when creating a Transport.Dylan Thacker-Smith
Fixes #399
2014-09-22Changelog re #399Jeff Forcier
2014-09-2280-col tweaksJeff Forcier
2014-09-19Changelog re #167Jeff Forcier
2014-09-19SSHConfig.get_hostnames: List literal hostnames from SSH configSøren Løvborg
2014-09-18Merge pull request #397 from alex/patch-4Jeff Forcier
Don't tell pip to use mirrors anymore
2014-09-18Merge branch '1.13' into 1.14Jeff Forcier
2014-09-18Merge branch '1.14' into 1.15Jeff Forcier
2014-09-18Merge branch '1.15'Jeff Forcier
2014-09-18And moarJeff Forcier
2014-09-18Fix more missed epydoc syntaxJeff Forcier
2014-09-18Merge branch '1.13' into 1.14Jeff Forcier
2014-09-18Merge branch '1.14' into 1.15Jeff Forcier
2014-09-18Merge branch '1.15'Jeff Forcier
2014-09-18Make keys doc file easier to followJeff Forcier
2014-09-18Missed some old spots re: ECDSA docs still being epydocJeff Forcier
2014-09-18Missed some old spots re: ECDSA docs still being epydocJeff Forcier
2014-09-18Merge branch '1.14' into 1.15Jeff Forcier
2014-09-18Merge branch '1.13' into 1.14Jeff Forcier
2014-09-18Remind user to update RTD after cutting a new release lineJeff Forcier
2014-09-18Cut 1.15Jeff Forcier
2014-09-18A herp and a derp (and an import shuffle)Jeff Forcier
2014-09-18Merge branch 'master' into 216-intJeff Forcier
2014-09-18Changelog re #393Jeff Forcier
2014-09-18Merge branch 'master' into 393-intJeff Forcier
2014-09-18Revert attempts to run Kerberos tests :(Jeff Forcier
2014-09-18Fix more dumb non-comment commentsJeff Forcier
2014-09-18Note how python-gssapi only works on 2.7+Jeff Forcier
2014-09-18Install docs tweak re: GSSAPI reqJeff Forcier
2014-09-18Add ability to run Kerberos tests to the test runner.Jeff Forcier
Includes merging coverage task into test task
2014-09-18Clean up & tweak failing sftp closure testJeff Forcier