Commit Graph

2164 Commits

Author SHA1 Message Date
terrafrost
0e0bdf6210 Merge branch 'phpdoc-master'
Conflicts:
	phpseclib/Crypt/Base.php
	phpseclib/Crypt/DES.php
	phpseclib/Crypt/Rijndael.php
2015-10-13 09:31:21 -05:00
terrafrost
177b52088d Merge branch '2.0' 2015-10-12 23:10:15 -05:00
terrafrost
c9af3bd9a7 Merge branch '1.0' into 2.0 2015-10-12 23:09:07 -05:00
terrafrost
da1a2df5aa Merge branch 'getkeylength-2.0-2' into 2.0 2015-10-12 23:09:04 -05:00
terrafrost
666092c889 Merge branch 'getkeylength' into 1.0 2015-10-12 22:59:46 -05:00
terrafrost
0e3fdec56b Merge branch 'getkeylength' into getkeylength-2.0-2 2015-10-12 22:53:59 -05:00
terrafrost
5f1ff099da Crypt/Base: one more cs update 2015-10-12 22:52:56 -05:00
terrafrost
8686ced6d3 Merge branch 'phpdoc-2.0' into phpdoc-master
Conflicts:
	phpseclib/Crypt/Hash.php
	phpseclib/Crypt/RSA.php
2015-10-12 21:37:44 -05:00
terrafrost
2b427eb02a fix merge issues 2015-10-12 14:21:22 -05:00
terrafrost
33ea01f1ac Merge branch 'phpdoc-1.0' into phpdoc-2.0
Conflicts:
	phpseclib/Crypt/AES.php
	phpseclib/Crypt/Base.php
	phpseclib/Crypt/Blowfish.php
	phpseclib/Crypt/DES.php
	phpseclib/Crypt/Hash.php
	phpseclib/Crypt/RC2.php
	phpseclib/Crypt/RC4.php
	phpseclib/Crypt/RSA.php
	phpseclib/Crypt/Rijndael.php
	phpseclib/Crypt/TripleDES.php
	phpseclib/Crypt/Twofish.php
	phpseclib/File/ASN1.php
	phpseclib/File/X509.php
	phpseclib/Math/BigInteger.php
	phpseclib/Net/SCP.php
	phpseclib/Net/SFTP.php
	phpseclib/Net/SSH1.php
	phpseclib/Net/SSH2.php
	phpseclib/System/SSH/Agent.php
2015-10-12 14:10:26 -05:00
terrafrost
2048a49aac use self:: in phpdoc comments to reduce merge conflicts 2015-10-11 12:22:07 -05:00
terrafrost
19229ed224 phpDoc changes 2015-10-05 13:22:51 -05:00
terrafrost
49393d1b3a Merge branch 'getkeylength' into getkeylength-2.0-2
Conflicts:
	phpseclib/Crypt/Base.php
	phpseclib/Crypt/Blowfish.php
	phpseclib/Crypt/DES.php
	phpseclib/Crypt/Rijndael.php
2015-10-04 21:38:47 -05:00
terrafrost
d91158f6ef rename key_size -> key_length 2015-10-04 21:06:17 -05:00
terrafrost
26a0a0890c Merge branch 'getkeylength' into getkeylength-2.0-2
Conflicts:
	phpseclib/Crypt/RC2.php
	phpseclib/Crypt/TripleDES.php
2015-10-04 16:40:15 -05:00
terrafrost
27034825f3 cs changes per bantu 2015-10-04 16:29:48 -05:00
Andreas Fischer
0ba1a04c05 Merge branch '2.0'
* 2.0:
  SFTP: don't start in local file middle when uploading to middle of the remote file
  Tests/SFTP: updates to newly added unit test
  SFTP: backport DavidAnderson684's changes to 1.0 branch
  add unit test demo'ing issue # 830
2015-09-30 17:28:03 +02:00
Andreas Fischer
b8071428f1 Merge branch '1.0' into 2.0
* 1.0:
2015-09-30 17:27:45 +02:00
Andreas Fischer
cf101b5d8c Merge pull request #834 from terrafrost/sftp-endless-loop-v2
SFTP.php : prevent endless loop when upload completed with non-zero $start or $local_start for 2.0

* terrafrost/sftp-endless-loop-v2:
  SFTP: don't start in local file middle when uploading to middle of the remote file
  Tests/SFTP: updates to newly added unit test
  SFTP: backport DavidAnderson684's changes to 1.0 branch
  add unit test demo'ing issue # 830
2015-09-30 17:27:37 +02:00
Andreas Fischer
c0e42ad751 Merge pull request #833 from terrafrost/sftp-endless-loop
SFTP.php : prevent endless loop when upload completed with non-zero $start or $local_start for 1.0

* terrafrost/sftp-endless-loop:
  SFTP: don't start in local file middle when uploading to middle of the remote file
  Tests/SFTP: updates to newly added unit test
  SFTP: backport DavidAnderson684's changes to 1.0 branch
  add unit test demo'ing issue # 830
2015-09-30 17:26:23 +02:00
terrafrost
0f49fb86bf Merge branch 'sftp-endless-loop' into sftp-endless-loop-v2
Conflicts:
	phpseclib/Net/SFTP.php
	tests/Functional/Net/SFTPUserStoryTest.php
2015-09-29 21:51:20 -05:00
terrafrost
6688f650f1 SFTP: don't start in local file middle when uploading to middle of
the remote file
2015-09-29 21:39:35 -05:00
terrafrost
26ddf02fee Merge branch 'sftp-endless-loop' into sftp-endless-loop-v2
Conflicts:
	phpseclib/Net/SFTP.php
2015-09-28 09:20:38 -05:00
terrafrost
759e04f08e Tests/SFTP: updates to newly added unit test 2015-09-27 10:57:41 -05:00
terrafrost
e2a2ad8c91 SFTP: backport DavidAnderson684's changes to 1.0 branch 2015-09-27 10:56:05 -05:00
terrafrost
23db2f7be3 add unit test demo'ing issue # 830 2015-09-27 10:54:08 -05:00
Andreas Fischer
70f55bd156 Merge pull request #825 from terrafrost/rsa-revamp
RSA: make createKey static and make it return RSA objects

* terrafrost/rsa-revamp:
  RSA: make createKey static and make it return RSA objects
2015-09-25 13:16:56 +02:00
terrafrost
fab5a66fe5 RSA: make createKey static and make it return RSA objects 2015-09-24 09:43:19 -05:00
terrafrost
1f47daede7 Merge branch 'getkeylength' into getkeylength-2.0-2 2015-09-24 09:29:56 -05:00
terrafrost
8691035228 Crypt/Base: add getBlockLength() method 2015-09-24 09:29:00 -05:00
terrafrost
604dddc82b Merge branch 'getkeylength' into getkeylength-2.0-2
Conflicts:
	phpseclib/Crypt/Blowfish.php
	phpseclib/Crypt/DES.php
	phpseclib/Crypt/RC2.php
	phpseclib/Crypt/RC4.php
	phpseclib/Crypt/Rijndael.php
	phpseclib/Crypt/TripleDES.php
	phpseclib/Crypt/Twofish.php
2015-09-22 21:26:00 -05:00
terrafrost
bfba3db1a7 Crypt: make it so the key length can be explicitly set for all ciphers 2015-09-20 12:24:06 -05:00
Andreas Fischer
f278e60c9c Merge pull request #823 from GrahamForks/readme-3
[3.0] Fixed readme links

* GrahamForks/readme-3:
  Fixed readme
2015-09-16 13:43:17 +02:00
Andreas Fischer
84a60cfff5 Merge branch '2.0'
* 2.0:
  Fixed readme
  Fixed readme links
2015-09-16 13:43:10 +02:00
Andreas Fischer
bff8e3093f Merge pull request #822 from GrahamForks/readme-2
[2.0] Fixed readme links

* GrahamForks/readme-2:
  Fixed readme
2015-09-16 13:41:09 +02:00
Andreas Fischer
aef80c4182 Merge branch '1.0' into 2.0
* 1.0:
  Fixed readme links

Conflicts:
	README.md
2015-09-16 13:41:01 +02:00
Andreas Fischer
34f581554a Merge pull request #821 from GrahamForks/readme
[1.0] Fixed readme links

* GrahamForks/readme:
  Fixed readme links
2015-09-16 13:40:37 +02:00
Andreas Fischer
ccd18552e5 Merge branch '2.0'
* 2.0:
  Fixed phpdoc

Conflicts:
	phpseclib/Crypt/Hash.php
2015-09-16 13:36:04 +02:00
Andreas Fischer
95ccad70ee Merge pull request #820 from GrahamForks/phpdoc
[2.0 Fixed phpdoc

* GrahamForks/phpdoc:
  Fixed phpdoc
2015-09-16 13:34:55 +02:00
Andreas Fischer
5772f74199 Merge branch '2.0'
* 2.0:
  Composer: add GrahamCampbell to composer.json
  AUTHORS: add GrahamCampbell
2015-09-16 13:31:06 +02:00
Andreas Fischer
cb0f1a57e6 Merge branch '1.0' into 2.0
* 1.0:
  Composer: add GrahamCampbell to composer.json
  AUTHORS: add GrahamCampbell

Conflicts:
	composer.lock
2015-09-16 13:31:01 +02:00
Andreas Fischer
b48a01ec00 Merge pull request #824 from terrafrost/new-author
AUTHORS: add GrahamCampbell

* terrafrost/new-author:
  Composer: add GrahamCampbell to composer.json
  AUTHORS: add GrahamCampbell
2015-09-16 13:29:41 +02:00
terrafrost
fae274f9c9 Composer: add GrahamCampbell to composer.json 2015-09-15 19:12:57 -05:00
terrafrost
7b0b111fcd AUTHORS: add GrahamCampbell 2015-09-15 13:23:52 -05:00
Graham Campbell
fa41c5cac6 Fixed readme 2015-09-15 17:32:08 +01:00
Graham Campbell
7d11c830ce Fixed readme 2015-09-15 17:30:33 +01:00
Graham Campbell
783a07fecd Fixed readme links 2015-09-15 17:28:41 +01:00
Andreas Fischer
3b33941d3d Merge pull request #813 from bantu/hash-rewrite
[master] More work on Hash.php

* bantu/hash-rewrite:
  Hash: Cover remaining uncovered line.
  Hash: Update incorrect documentation, use max line length 80.
  Hash: Remove constructor return value documentation.
  Hash: Do not assign false to length property. It's documented as an int.
  Hash: Rename properly l to length.
  Slightly rework of HashTest.php.
2015-09-14 22:47:37 +02:00
Graham Campbell
7f1bbfe216 Fixed phpdoc 2015-09-14 16:30:31 +01:00
Andreas Fischer
970398f341 Merge pull request #819 from bantu/travis-php7-nofail
No longer allow Travis CI to fail on PHP 7.

* bantu/travis-php7-nofail:
  No longer allow Travis CI to fail on PHP 7.
2015-09-14 15:25:14 +02:00