dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,028 Commits 8 Branches 20 Tags 3.3 MiB
Commit Graph

628 Commits

Author SHA1 Message Date
Jeff Forcier 0965eaa65d Merge branch '1.11' into 1.12 
Conflicts:
	paramiko/hostkeys.py
	sites/www/changelog.rst
 2014-02-14 11:54:39 -08:00
Jeff Forcier 4e9af2f7ca Merge branch '1.10' into 1.11 
Conflicts:
	sites/www/changelog.rst
 2014-02-14 11:53:59 -08:00
Jeff Forcier 9d7aeff7b1 Use constant time hash comparisons for improved security. 
See e.g. http://codahale.com/a-lesson-in-timing-attacks/

Mega thanks to Alex Gaynor for the original patch.
 2014-02-14 11:52:00 -08:00
Jeff Forcier fb786bea9c Cut 1.12.2 2014-02-14 09:39:11 -08:00
Jeff Forcier 4a5f007c02 Cut 1.11.4 2014-02-14 09:38:14 -08:00
Jeff Forcier 457a34f55b Cut 1.10.6 2014-02-14 09:36:33 -08:00
Jeff Forcier 758543f238 Merge branch '1.11' into 1.12 2014-02-14 09:16:43 -08:00
Jeff Forcier d438ff6b64 Don't raise timeouts as ProxyCommand failures, thanks @mgedmin 2014-02-13 13:44:46 -08:00
Jeff Forcier 4402f67fa6 Don't drop/lose data when our inner timeout goges off. 2014-02-13 13:44:27 -08:00
Jeff Forcier 244e09f57a Slightly safer socket.error handling 2014-02-13 12:54:23 -08:00
Marius Gedminas cfd1efe648 Fix NameError in error-handling case 
Fixes #268
 2014-02-13 09:38:00 -08:00
Jeff Forcier 58489c893e Potentially horrible attempt at manual subprocess-read timeouts 2014-02-12 17:16:34 -08:00
Jeff Forcier 5b6059c4bd Nuke old merge mistake (or what looks like one anyway.) 2014-02-12 09:48:04 -08:00
Jeff Forcier 3a7b66a814 Merge branch '1.11' into 1.12 
Conflicts:
	sites/www/changelog.rst
 2014-02-11 14:26:34 -08:00
Jeff Forcier 36b937d436 Merge branch '1.10' into 1.11 2014-02-11 09:48:00 -08:00
Jeff Forcier 675e30986e Clean up a list-comp (also fixes race condition) 2014-02-11 08:06:14 -08:00
Jeff Forcier 280c240685 Whitespace 2014-02-10 18:11:29 -08:00
Jeff Forcier aed86f26bf Future import for with: under py25 2014-02-10 18:10:52 -08:00
Jeff Forcier 1560c4ab8a Merge remote-tracking branch 'ewxrjk/issue34' into sftp-reordering-34 2014-02-10 17:59:52 -08:00
Jeff Forcier c8ebe05ffc Merge branch '1.11' into 1.12 
Conflicts:
	NEWS
 2014-01-21 13:59:45 -08:00
Jeff Forcier 2cf23bf784 Merge branch '1.10' into 1.11 
Conflicts:
	NEWS
 2014-01-21 13:58:44 -08:00
Jeff Forcier a7ea04842e Clean up thread ident import/exec a bit. 2014-01-21 13:51:09 -08:00
Aarni Koskela 39809dab31 Try Py2.5 compatibility as last fallback for thread identity. 2014-01-21 13:31:45 -08:00
Aarni Koskela b0c689d7c8 Support Py2.5 to Py3.4 for thread identity (thanks @lndbrg) 2014-01-21 13:31:43 -08:00
Aarni Koskela d32d457775 Fix agent auth on Windows/Python 2.5) (with thanks to @lndbrg) 2014-01-21 13:31:25 -08:00
Aarni Koskela d8738b1b0f Fix #193 (use RtlMoveMemory instead of msvcrt.memcpy) 2014-01-21 13:30:32 -08:00
Jeff Forcier 6ecde066fc Cut 1.12.1 2014-01-08 16:41:44 -08:00
Jeff Forcier 1ff3db96f6 Cut 1.11.3 2014-01-08 16:41:04 -08:00
Jeff Forcier 698adf10fb Cut 1.10.5 2014-01-08 16:40:11 -08:00
Jeff Forcier 96ca8d49c1 Merge branch '1.11' into 1.12 
Conflicts:
	NEWS
 2014-01-08 13:43:42 -08:00
Jeff Forcier b352357efb Merge branch '1.10' into 1.11 
Conflicts:
	NEWS
 2014-01-08 13:43:03 -08:00
Nathan Scowcroft 0fea895cdb ditto 2014-01-08 12:45:22 -08:00
Nathan Scowcroft a1c1f8f29f Check correct stored hosts filename. 2014-01-08 12:45:14 -08:00
Jeff Forcier a9a5f69c1a Merge branch '1.11' into 1.12 
Conflicts:
	paramiko/__init__.py
 2013-10-16 17:01:01 -07:00
Jeff Forcier 75c4304fe2 Merge branch '1.10' into 1.11 
Conflicts:
	paramiko/__init__.py
 2013-10-16 17:00:46 -07:00
Jeff Forcier 3232ce84ed Merge branch '1.9' into 1.10 
Conflicts:
	paramiko/__init__.py
 2013-10-16 17:00:33 -07:00
Jeff Forcier 858d3fd07f Merge branch '1.8' into 1.9 
Conflicts:
	paramiko/__init__.py
 2013-10-16 17:00:13 -07:00
Mike Gabriel 6b222528f3 Reintroduce __version_info__ variable 
At least one application (mysql-workbench) (used to) use(s) the __version_info__
that got removed by commit 99859b8b02.

Breaking existing software with new versions of paramiko should be avoided.
This pull-request reintroduces the __version_info__ var, but fills it
from the __version__ var. No need to maintain multiple version strings.

Conflicts:
	paramiko/__init__.py
 2013-10-16 16:59:35 -07:00
Jeff Forcier 96fdefbcb9 Merge branch '1.10' into 1.11 
Updated versions for 1.11.2.

Conflicts:
	paramiko/__init__.py
	setup.py
 2013-09-27 22:00:32 -07:00
Jeff Forcier f2466a3d46 Update version for 1.10.4 2013-09-27 21:59:48 -07:00
Jeff Forcier 28d78e4e6a Merge branch '1.11' 2013-09-27 21:29:59 -07:00
Jeff Forcier 07e61c3552 Merge branch '1.10' into 1.11 2013-09-27 21:29:56 -07:00
Jeff Forcier e25c7c4bdf Merge branch '1.9' into 1.10 2013-09-27 21:29:51 -07:00
Jeff Forcier 2de9c72720 Merge branch '1.8' into 1.9 2013-09-27 21:29:41 -07:00
Jeff Forcier 83f44878ea Fixed a typo in the license header of most files 
Conflicts:
	paramiko/proxy.py
 2013-09-27 21:29:18 -07:00
Benjamin Pollack 5e744d37c7 Add support for the SSH env command 2013-09-27 20:51:31 -07:00
Jeff Forcier e0b401b8d9 Merge branch '152-int' into 152-real-int 
Conflicts:
	paramiko/hostkeys.py
	requirements.txt
 2013-09-27 17:50:25 -07:00
Jeff Forcier 8ab4cbd2a0 Bump version for dev 2013-09-27 17:44:06 -07:00
Jeff Forcier cba4c68365 Merge branch '1.11' into 156-int 2013-09-27 17:30:34 -07:00
Jeff Forcier 7243f8fe90 Merge branch '1.10' into 1.11 
Conflicts:
	NEWS
 2013-09-27 16:15:31 -07:00