Commit Graph

1399 Commits

Author SHA1 Message Date
Jeff Forcier 5ec984960b Merge branch '1.13' 2014-05-07 14:16:23 -07:00
Jeff Forcier 7484a22180 Cut 1.13.1 2014-05-07 14:14:05 -07:00
Jeff Forcier c7f67445f7 Merge branch '1.12' into 1.13
Conflicts:
	paramiko/__init__.py
	setup.py
	sites/www/changelog.rst
2014-05-07 14:10:07 -07:00
Jeff Forcier 09e9d48db0 Cut 1.12.4 2014-05-07 13:47:09 -07:00
Jeff Forcier ec2460fb3c Merge branch '1.11' into 1.12
Conflicts:
	paramiko/__init__.py
	setup.py
2014-05-07 13:40:19 -07:00
Jeff Forcier c0667e1e6a Cut 1.11.6 2014-05-07 13:39:39 -07:00
Jeff Forcier 54613b6885 Merge branch 'master' of github.com:paramiko/paramiko 2014-04-24 11:19:51 -07:00
Jeff Forcier c1434dbd24 Merge branch '1.13' 2014-04-24 11:06:02 -07:00
Jeff Forcier 5837b7c21a Formatting 2014-04-24 10:26:46 -07:00
Jeff Forcier c7c1a24e30 Fix some trailing whitespace 2014-04-24 10:26:33 -07:00
Jeff Forcier 6f4c159b05 Merge updated a01e449 from al-tonio 2014-04-24 10:25:37 -07:00
Jeff Forcier cc3f860fc0 Merge branch '1.13' 2014-04-24 10:20:14 -07:00
Jeff Forcier 74c612e328 Use newer alabaster w/ showhidden in sidebar TOC
Lets us not have 2x TOCs on landing page
2014-04-24 10:18:35 -07:00
Jeff Forcier 337f4432d3 README py3 update 2014-04-24 10:18:05 -07:00
Jeff Forcier 8411db5b7c Merge branch '1.13' 2014-04-24 10:15:05 -07:00
Jeff Forcier 24309559bb Show Travis status in website sidebar 2014-04-24 10:14:35 -07:00
Jeff Forcier a1c2a9829a Errything uses intersphinx to Python 2014-04-24 10:12:15 -07:00
Jeff Forcier 4fe3ad2220 Nuke Fab-oriented link color override 2014-04-24 10:11:51 -07:00
Jeff Forcier 7a709498dc Formatting 2014-04-24 10:11:17 -07:00
Jeff Forcier 7e84566772 Update copyright in README to be more accurate 2014-04-24 10:10:12 -07:00
Jeff Forcier e6f9f03b08 Merge branch '1.11' into 1.12 2014-04-24 09:34:00 -07:00
Jeff Forcier 1321bc41df Merge branch '1.13' 2014-04-24 09:34:00 -07:00
Jeff Forcier ae30b31721 Merge branch '1.12' into 1.13 2014-04-24 09:34:00 -07:00
Jeff Forcier ac4c754718 Fix incorrect monospacing 2014-04-24 09:33:56 -07:00
Jeff Forcier a759a8e8df Fix incorrect monospacing 2014-04-24 09:33:48 -07:00
Jeff Forcier 5636381591 Reword docs/changelog re #315 2014-04-24 09:33:38 -07:00
Antoine Brenner 3fce8abf68 BufferedFile.read() now returns byte strings instead of text strings
It is the right thing to do since we have no idea what encoding the file
is in, or even if the file is text data. BufferedFile.readline() is
unchanged and returns text strings assuming the file is utf-8 encoded.
This should fix the following issue:
http://comments.gmane.org/gmane.comp.sysutils.backup.obnam/252

Antoine Brenner

Conflicts:
	sites/www/changelog.rst
2014-04-17 17:52:34 -04:00
Jeff Forcier 417102dbea Merge pull request #307 from offbyone/tox-py25
Remove python 2.5 from tox
2014-04-16 17:31:22 -04:00
Jeff Forcier 4947a726c1 Merge branch '1.11' into 1.12 2014-04-16 15:51:04 -04:00
Jeff Forcier a1d291e047 Merge branch '1.13' 2014-04-16 15:51:04 -04:00
Jeff Forcier 9b2388cad5 Merge branch '1.12' into 1.13 2014-04-16 15:51:04 -04:00
Jeff Forcier 30f6f98afd Added self.args for exception classes. Used for unpickling
Related to fabric/fabric#986 and fabric/fabric#714

Conflicts:
	sites/www/changelog.rst
2014-04-16 15:51:01 -04:00
Jeff Forcier 1b796861aa Merge branch '1.13' 2014-04-16 15:24:09 -04:00
Jeff Forcier ba017e9e6c Merge branch '1.12' into 1.13
Conflicts:
	paramiko/sftp_client.py
	sites/www/changelog.rst
	tests/test_sftp.py
2014-04-16 15:24:04 -04:00
Jeff Forcier a0b2ae293f Merge branch '1.11' into 1.12 2014-04-16 15:09:30 -04:00
Jeff Forcier 6e9abc39cf Fix logging error in sftp_client for filenames containing the character.
Bug reported here:
http://vlists.pepperfish.net/pipermail/obnam-flarn.net/2013-May/000767.html

Antoine Brenner

Backported to 1.11 by @bitprophet

Conflicts:
	paramiko/sftp_client.py
	sites/www/changelog.rst
	tests/test_sftp.py
2014-04-16 15:07:56 -04:00
Jeff Forcier c14de1d935 Show Travis status in website sidebar 2014-04-15 15:04:46 -04:00
Jeff Forcier e05276b6ab Merge branch '1.13'
Conflicts:
	sites/www/changelog.rst
2014-04-14 18:54:32 -04:00
Jeff Forcier 6dee34648e Merge pull request #310 from offbyone/fix-sporadic-test-failures
Revert a regression in DSS key generation
2014-04-14 18:52:43 -04:00
Chris Rose 34d03ae3dc Revert a regression in DSS key generation
A change in f0017b8330 caused a random regression in DSS key signing
due to moving the padding on the integers generated by DSA from the left
to the right.

So, for example, if signing the test case string "jerri blank", the
random number might be generated as:

k=703745698612177278239572677252380378525350342103

If so, the signature parts will be:
r=184615963997659989901526712385095827509599268253
s=2682547683721156713440053885014828604195555319

Note the s being shorter.

Prior to f0017b8330, s would be right-padded with zeros:
s=268254768372115671344005388501482860419555531900

After, it would be left-padded:
s=002682547683721156713440053885014828604195555319

When converting back to a long, that loses the padding. This change
restores the behaviour.

Fixes #308
2014-04-14 18:50:10 -04:00
Jeff Forcier d02ae56601 Note changelog location in contribution docs 2014-04-14 18:28:03 -04:00
Jeff Forcier e96e2653a2 Changelog, closes #299 2014-04-14 11:29:41 -04:00
Alex Gaynor 91ab5f0c75 Merge branch 'master' into ecdsa-deterministic
Conflicts:
	paramiko/ecdsakey.py
2014-04-14 11:06:44 -04:00
Jeff Forcier 9e2e981224 Changelog, closes #297 2014-04-14 11:05:25 -04:00
Alex Gaynor b0876fa013 Merge branch 'master' into ecdsa-deterministic
Conflicts:
	paramiko/ecdsakey.py
2014-04-14 10:58:43 -04:00
Alex Gaynor 191fd465f1 Merge branch 'master' into use-urandom
Conflicts:
	paramiko/dsskey.py
	paramiko/ecdsakey.py
	paramiko/hostkeys.py
	paramiko/kex_gex.py
	paramiko/kex_group1.py
	paramiko/pkey.py
	paramiko/primes.py
	paramiko/rsakey.py
	tests/test_pkey.py
2014-04-14 10:56:05 -04:00
Jeff Forcier fa86d655dc Merge pull request #296 from alex/remove-unused
Remove unused function
2014-04-14 10:50:28 -04:00
Jeff Forcier 1e0e296b05 Derp 2014-04-14 10:50:12 -04:00
Jeff Forcier 59a696cef2 Merge branch '295-int' 2014-04-14 10:49:54 -04:00
Jeff Forcier 160e2c08e0 Changelog, closes #295 2014-04-14 10:48:59 -04:00