metaclassing
4735751bf5
Switched out pack/unpack and ip2long/long2ip with inet_pton/ntop for ipv6 encoding support in x509v3 subject alternative names
2016-01-26 17:23:14 -06:00
terrafrost
750f7652c7
Merge remote-tracking branch 'joey3000/use_cleanup'
2016-01-25 17:00:30 -06:00
terrafrost
cd700ce8b3
Merge branch '2.0'
2016-01-25 16:58:48 -06:00
Joey3000
bdc28b9453
Cherry-picking cleanup of use operator usage
...
Picked c9a80ff748
2016-01-21 19:41:41 +01:00
terrafrost
977a4ebeaa
Merge pull request #925 from terrafrost/rsa-revamp-part-3
...
RSA: error out when encrypting strings that are too long
2016-01-21 10:20:53 -06:00
terrafrost
cea059e9dd
Crypt/Base: updates to IV handling per Joey3000
2016-01-20 10:09:06 -06:00
Joey3000
c9a80ff748
Cleanup of use operator usage
...
This does the following:
1. Removes superfluous usage of the `use` operator. Specifically, that operator is not needed to use classes in the same `namespace` as the object (see https://secure.php.net/manual/en/language.namespaces.rules.php ).
2. While at it, also sorted the `use` operators alphabetically, for a better overview.
2016-01-18 05:05:31 +01:00
terrafrost
d5a868ed4f
Crypt/Base: throw an exception if an IV is required but not defined
2016-01-17 11:48:07 -06:00
terrafrost
5d85d5eca1
RSA: error out when encrypting strings that are too long
2016-01-17 09:45:13 -06:00
terrafrost
999cc470b1
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2016-01-16 22:59:38 -06:00
terrafrost
ad4c3670d3
Merge branch 'biginteger-revamp'
2016-01-16 22:59:19 -06:00
terrafrost
f8a92a7e40
Merge branch '2.0'
2016-01-13 16:51:48 -06:00
terrafrost
b6899d9e79
Merge branch '1.0' into 2.0
2016-01-13 16:51:33 -06:00
terrafrost
0905143fc1
SSH/Agent: fix possible PHP Warning
2016-01-13 16:51:12 -06:00
terrafrost
6abbbfdfe3
RSA: change default key size to 2048
2016-01-08 13:58:06 -06:00
terrafrost
f8dc527af5
Merge branch 'master' into biginteger-revamp
2016-01-08 10:43:49 -06:00
terrafrost
232880b0d9
Merge branch '2.0'
2016-01-08 10:43:11 -06:00
terrafrost
62fc4bbc88
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0
2016-01-08 10:42:59 -06:00
terrafrost
1e15ef5a55
Merge branch 'bitwise-not-1.0' into 2.0
2016-01-08 10:42:20 -06:00
terrafrost
7ad9eade2d
BigInteger: fix issue with doing bitwise not on 0
2016-01-08 10:31:48 -06:00
terrafrost
f7efbcbc8e
BigInteger: updates per Joey3000
2016-01-08 10:19:48 -06:00
terrafrost
c85b356b18
RSA: more updates per Joey3000
2016-01-07 22:26:10 -06:00
terrafrost
d5a359b41e
RSA: updates per Joey3000
2016-01-03 13:03:58 -06:00
terrafrost
d86c61de78
BigInteger: add getprecision
2016-01-03 10:42:44 -06:00
terrafrost
a0d21b6321
BigInteger: make select methods static, add type hinting, etc
2015-12-27 10:24:17 -06:00
terrafrost
806249c7e9
RSA: changes to how encryption / signatures work
2015-12-25 11:28:24 -06:00
terrafrost
94fdbba2aa
Merge branch '2.0'
2015-12-23 23:42:23 -06:00
terrafrost
001ad99d73
Merge branch '1.0' into 2.0
2015-12-23 23:32:20 -06:00
terrafrost
1be0ac9f7f
SFTP/Stream: fix issue with filenames with hash in them
2015-12-23 13:13:06 -06:00
terrafrost
600f9c4e4b
SSH2: update isAuthenticated to work with 2.0 / master branches
2015-12-16 09:21:37 -06:00
terrafrost
d17aeffc04
Merge branch 'authenticated-1.0' into authenticated-2.0
2015-12-16 09:20:27 -06:00
terrafrost
57063f3604
SSH2: add isAuthenticated() method
2015-12-15 23:19:05 -06:00
terrafrost
b1deba5a28
Merge branch '2.0'
2015-12-14 13:56:27 -06:00
terrafrost
eac8613c75
BigInteger: 2.0 specific updates for __debuginfo
2015-12-14 13:56:07 -06:00
terrafrost
786cecf309
Merge branch '1.0' into identifier-update-1.0
2015-12-14 11:07:42 -06:00
terrafrost
b95504ac8f
Merge branch 'rsa-pkcs8-fix-2.0-2' into 2.0
2015-12-14 11:02:49 -06:00
terrafrost
b86497d298
Merge branch '2.0'
2015-12-14 11:02:14 -06:00
terrafrost
8448f63d76
Merge branch '1.0' into 2.0
2015-12-14 11:01:51 -06:00
terrafrost
f17f1b2baf
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into small-tweaks-2
2015-12-11 13:44:39 -06:00
terrafrost
1c9ee4ef28
RSA: fix PKCS8 key handling (again)
2015-12-07 23:53:09 -06:00
terrafrost
c655b16f75
BigInteger: add engine to __debugInfo output and add unit test
2015-12-07 15:22:53 -06:00
terrafrost
ee0f45fea6
update identifier to current version
2015-12-05 10:33:28 -06:00
Andreas Fischer
18cc8eb1c3
Merge branch '2.0'
...
* 2.0:
Fix PHP invalid index warning
2015-11-24 09:28:00 +01:00
Andreas Fischer
d80651738f
Merge branch '1.0' into 2.0
...
* 1.0:
Fix PHP invalid index warning
2015-11-24 09:28:00 +01:00
splitice
77d5f8da20
Fix PHP invalid index warning
2015-11-24 09:13:30 +01:00
terrafrost
37535744b2
small tweaks
2015-11-21 22:55:20 -05:00
Andreas Fischer
466ad666b8
Merge branch '1.0' into 2.0
...
* 1.0:
2015-11-10 10:05:06 +01:00
terrafrost
c34be16c3a
Merge branch 'rsa-pkcs8-fix' into rsa-pkcs8-fix-2.0
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-11-09 23:10:21 -06:00
terrafrost
7339112e10
RSA: fix issue with loading PKCS8 specific keys
2015-11-09 22:53:50 -06:00
terrafrost
43165d976c
RSA: changes to OpenSSH and PuTTY plugins
2015-10-24 15:54:34 -05:00
terrafrost
7b1b7c22e2
RSA: throw an exception if the modulo is too small
2015-10-23 13:45:35 -05:00
terrafrost
1522e6606b
RSA: add getSupportedFormats() and getLoadedFormat()
2015-10-22 10:57:05 -05:00
terrafrost
efe36d67ce
Merge branch 'master' into rsa-plugins
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-10-22 10:16:52 -05:00
terrafrost
33bf6e42c3
Merge branch '2.0'
2015-10-22 10:14:50 -05:00
terrafrost
96dd14fd6f
Merge branch 'extractber-fix' into extractber-fix-2.0
...
Conflicts:
phpseclib/File/X509.php
2015-10-22 09:56:07 -05:00
terrafrost
46bb95a265
X509: improve base64-encoded detection rules
2015-10-22 09:45:40 -05:00
terrafrost
e2fcd9d951
RSA: misc fixes to select plugins
2015-10-21 21:24:12 -05:00
terrafrost
6eb5ea3ef7
RSA: add support for the microsoft BLOB key format
2015-10-20 23:17:11 -05:00
Andreas Fischer
a88047f242
Merge branch '2.0'
...
* 2.0:
Add test case for GitHub Issue 850: Realpath in SFTP chmod().
Fixed a bug in SFTP::chmod not using realpath on the filepath
2015-10-19 00:19:08 +02:00
Andreas Fischer
1cf70d27e8
Merge branch '1.0' into 2.0
...
* 1.0:
Add test case for GitHub Issue 850: Realpath in SFTP chmod().
Fixed a bug in SFTP::chmod not using realpath on the filepath
2015-10-19 00:19:07 +02:00
Bob4ever
b67c690498
Fixed a bug in SFTP::chmod not using realpath on the filepath
2015-10-19 00:05:02 +02:00
terrafrost
ad55d3cd75
RSA: fixes to last non-merge commit
2015-10-16 14:04:17 -05:00
terrafrost
a9705fdba7
Merge branch 'master' into rsa-plugins
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-10-16 10:01:18 -05:00
terrafrost
31c14063fa
RSA: updates to raw plugin
2015-10-16 09:36:49 -05:00
terrafrost
04a8d784a5
Merge branch 'paragonie'
2015-10-14 10:11:38 -05:00
Scott
d899b7988d
Update random_bytes() to conform to PHP7.0.0-RC3
...
Fixes #843
2015-10-14 10:07:11 -05:00
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
a9d353d391
Merge branch 'phpdoc-2.0' into 2.0
...
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Rijndael.php
2015-10-13 09:16:39 -05:00
terrafrost
5321b9b610
Merge branch 'phpdoc-1.0' into 1.0
...
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Rijndael.php
2015-10-13 08:52:52 -05:00
terrafrost
177b52088d
Merge branch '2.0'
2015-10-12 23:10:15 -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
Scott
29b1bb7a58
Update random_bytes() to conform to PHP7.0.0-RC3
...
Fixes #843
2015-10-09 15:19:59 -04:00
terrafrost
19229ed224
phpDoc changes
2015-10-05 13:22:51 -05:00
terrafrost
829ce9a3ec
RSA: make it so plugin names are not case sensitive
2015-10-04 23:18:13 -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
terrafrost
cfcf554531
RSA: changes to putty plugin and rm comment methods from rsa etc
2015-10-01 23:11:55 -05:00
terrafrost
fd99814e79
RSA: CS adjustments
2015-10-01 16:11:23 -05:00
terrafrost
5bddb49c62
RSA: clean up merge
2015-10-01 16:02:28 -05:00
terrafrost
91887c957d
Merge remote-tracking branch 'upstream/master' into rsa-plugins
...
Conflicts:
phpseclib/Crypt/RSA.php
phpseclib/Net/SSH2.php
2015-10-01 15:57:31 -05:00
terrafrost
ec3fe7277b
RSA: move key format handling to plugins
2015-10-01 15:41:11 -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
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
e2a2ad8c91
SFTP: backport DavidAnderson684's changes to 1.0 branch
2015-09-27 10:56:05 -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
ccd18552e5
Merge branch '2.0'
...
* 2.0:
Fixed phpdoc
Conflicts:
phpseclib/Crypt/Hash.php
2015-09-16 13:36:04 +02: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
4d4b7f9aec
Merge branch '2.0'
...
* 2.0:
BigInteger: fix PHP7 error
2015-09-14 14:07:44 +02:00
terrafrost
3f7b3b393e
Merge branch 'php7' into 2.0
...
Conflicts:
phpseclib/Math/BigInteger.php
2015-09-13 19:15:13 -05:00
terrafrost
833da775b6
BigInteger: fix PHP7 error
...
$x = gmp_init(6); empty($x); demonstrates the problem
2015-09-13 19:13:31 -05:00
Andreas Fischer
7d3a1db469
Hash: Update incorrect documentation, use max line length 80.
2015-09-14 01:34:20 +02:00
Andreas Fischer
189b709afb
Hash: Remove constructor return value documentation.
2015-09-14 01:34:15 +02:00
Andreas Fischer
cd815c929e
Hash: Do not assign false to length property. It's documented as an int.
2015-09-14 01:33:41 +02:00
Andreas Fischer
b34de90818
Hash: Rename properly l to length.
2015-09-14 01:32:56 +02:00
Andreas Fischer
5745c8a5be
Merge branch '2.0'
...
* 2.0:
small CS changes
2015-09-14 01:30:54 +02:00
Andreas Fischer
2986ea9d6d
Merge pull request #816 from terrafrost/small-tweaks
...
small CS changes
* terrafrost/small-tweaks:
small CS changes
2015-09-14 01:30:54 +02:00
Andreas Fischer
3342eb6d09
Merge branch '2.0'
...
* 2.0:
Fixed another case
Minor tweaks
Fixed error
More fixes
PHPDoc fixes
2015-09-14 01:27:11 +02:00
Andreas Fischer
4387b64426
Merge branch '1.0' into 2.0
...
* 1.0:
Fixed another case
Minor tweaks
Fixed error
More fixes
PHPDoc fixes
Conflicts:
phpseclib/Crypt/Random.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
2015-09-14 01:27:04 +02:00
terrafrost
8b8d7a5dcd
small CS changes
2015-09-13 18:13:35 -05:00
Andreas Fischer
150065fb9c
Merge pull request #811 from terrafrost/hash-rewrite
...
Hash: rm internal and mhash support (5.3 has hash ext built-in)
* terrafrost/hash-rewrite:
Tests/Hash: tiger is buggy in PHP 5.3
Hash: rm internal and mhash implementations (5.3 has hash built in)
2015-09-07 19:08:24 +02:00
Andreas Fischer
ef3d0a8ed0
Merge pull request #806 from metaclassing/sshv1-exceptions
...
Exception support for SSHv1
* metaclassing/sshv1-exceptions:
I misinterpreted the meaning of === true and messed up quotes on one throw
Tried to replicate SSHv2 exception support into SSHv1
2015-09-07 00:39:26 +02:00
Graham Campbell
010c1285ba
Fixed another case
2015-09-06 23:05:41 +01:00
Graham Campbell
b1db7f05d9
Minor tweaks
2015-09-06 23:01:03 +01:00
Graham Campbell
06a1d3d981
Fixed error
2015-09-06 22:19:34 +01:00
terrafrost
d76ae873ac
Hash: rm internal and mhash implementations (5.3 has hash built in)
2015-09-06 07:55:33 -05:00
Graham Campbell
eec8c9cb5d
More fixes
2015-09-06 12:39:14 +01:00
Graham Campbell
dd031a1702
PHPDoc fixes
2015-09-06 12:28:08 +01:00
Andreas Fischer
70dc4448f7
Merge branch '2.0'
...
* 2.0:
Typo in variable name
2015-09-05 18:14:04 +02:00
Andreas Fischer
09ac065459
Merge branch '1.0' into 2.0
...
* 1.0:
Typo in variable name
2015-09-05 18:14:03 +02:00
Marc Delisle
01e7c65f07
Typo in variable name
2015-09-05 12:13:11 -04:00
metaclassing
029228b3fe
I misinterpreted the meaning of === true and messed up quotes on one throw
2015-09-04 14:20:51 -05:00
metaclassing
2b5c2eb9ab
Tried to replicate SSHv2 exception support into SSHv1
2015-09-04 14:13:16 -05:00
Andreas Fischer
0deae03dca
Merge branch '2.0'
...
* 2.0:
Remove unnecessary parens
Convert most instances of function_exists() to extension_loaded() where applicable
Remove conditions for PHP < 5.3.0 for this branch
Switch to extension_loaded('gmp')
Switch to extension_loaded instead of function_exists where it makes sense
2015-09-04 15:05:50 +02:00
Andreas Fischer
864493bbf6
Merge pull request #790 from cweagans/switch-to-extension-loaded-2.0
...
Switch to extension loaded (2.0)
* cweagans/switch-to-extension-loaded-2.0:
Remove conditions for PHP < 5.3.0 for this branch
Switch to extension_loaded('gmp')
Switch to extension_loaded instead of function_exists where it makes sense
2015-09-04 15:05:40 +02:00
Andreas Fischer
e08e2fd300
Merge pull request #791 from cweagans/switch-to-extension-loaded-1.0
...
Switch to extension loaded (1.0)
* cweagans/switch-to-extension-loaded-1.0:
Remove unnecessary parens
Convert most instances of function_exists() to extension_loaded() where applicable
2015-09-04 15:04:17 +02:00
Cameron Eagans
8206061a30
Remove unnecessary parens
2015-09-02 15:22:37 -04:00
Andreas Fischer
ed6f754137
Merge pull request #803 from GrahamForks/phpdoc
...
[3.0] PHPDoc Fixes
* GrahamForks/phpdoc:
Fixed lots of phpdoc typos
Fixed invalid param phpdoc
2015-09-02 20:49:05 +02:00
Andreas Fischer
40927a4033
Merge pull request #802 from GrahamForks/2.0-phpdoc
...
[2.0] PHPDoc Fixes
* GrahamForks/2.0-phpdoc:
Fixed lots of phpdoc typos
Fixed invalid param phpdoc
2015-09-02 20:47:45 +02:00
Andreas Fischer
e1bd0dfaf5
Merge pull request #801 from GrahamForks/1.0-phpdoc
...
[1.0] PHPDoc Fixes
* GrahamForks/1.0-phpdoc:
Fixed lots of phpdoc typos
Fixed invalid param phpdoc
2015-09-02 20:43:38 +02:00
Andreas Fischer
618215dd0d
Merge branch '2.0'
...
* 2.0:
Backport to 2.0: Add PHP7 to Travis CI.
Remove duplicate allow_failures section
Test on PHP 7 & allow failures
Coding standards fix
Switch from EngineException to Error
Remove string assignment
Use random_bytes() when appropriate.
2015-09-02 20:38:11 +02:00
Andreas Fischer
9691924b31
Merge pull request #794 from cweagans/php7-random-bytes-2.0
...
Use random_bytes() when appropriate (2.0)
* cweagans/php7-random-bytes-2.0:
Remove duplicate allow_failures section
Test on PHP 7 & allow failures
Coding standards fix
Switch from EngineException to Error
Remove string assignment
Use random_bytes() when appropriate.
2015-09-02 20:38:02 +02:00
Andreas Fischer
19d93fe76c
Merge branch '2.0'
...
* 2.0:
X509: updates to getOID() as suggested by bantu
X509: add getOID() method
2015-09-02 15:06:40 +02:00
Andreas Fischer
9fbc0358bb
Merge branch '1.0' into 2.0
...
* 1.0:
X509: updates to getOID() as suggested by bantu
X509: add getOID() method
2015-09-02 15:06:35 +02:00
Andreas Fischer
6433a10fa5
Merge pull request #787 from torinaki/remove-global-and-earn-25$
...
Connection reuse refactoring to rid of globals
* torinaki/remove-global-and-earn-25$:
Connection reuse refactoring to rid of globals
2015-09-02 15:04:52 +02:00
Graham Campbell
7cd45e5e1b
Fixed lots of phpdoc typos
2015-09-02 00:44:55 +01:00
Graham Campbell
2be0506514
Fixed invalid param phpdoc
2015-09-02 00:44:39 +01:00
Graham Campbell
634c1c2a18
Fixed lots of phpdoc typos
2015-09-02 00:42:15 +01:00
Graham Campbell
c08c099c56
Fixed invalid param phpdoc
2015-09-02 00:41:38 +01:00
Graham Campbell
cd0e10cf9d
Fixed lots of phpdoc typos
2015-09-02 00:37:54 +01:00
Graham Campbell
5890f3da98
Fixed invalid param phpdoc
2015-09-02 00:22:30 +01:00
Cameron Eagans
8a5dc21835
Coding standards fix
2015-09-01 15:00:57 -04:00
Cameron Eagans
bbbfc1795d
Switch from EngineException to Error
2015-09-01 14:56:06 -04:00
Cameron Eagans
08025c134d
Remove string assignment
2015-09-01 14:53:45 -04:00
Dmitry Balabka
70dd67c4d9
Connection reuse refactoring to rid of globals
2015-09-01 21:50:30 +03:00
Cameron Eagans
5a5edc7798
Use random_bytes() when appropriate.
2015-09-01 14:49:32 -04:00
Cameron Eagans
2b75c37cc9
Convert most instances of function_exists() to extension_loaded() where applicable
2015-09-01 14:32:22 -04:00
Cameron Eagans
78bac871af
Remove conditions for PHP < 5.3.0 for this branch
2015-09-01 14:22:22 -04:00
Cameron Eagans
df6b201ab9
Switch to extension_loaded('gmp')
2015-09-01 14:22:17 -04:00
Cameron Eagans
a84699a346
Switch to extension_loaded instead of function_exists where it makes sense
2015-09-01 14:22:12 -04:00
terrafrost
c27f70c577
Exceptions: CS adjustment
2015-08-31 23:54:35 -05:00
terrafrost
2a8da097ae
Merge branch 'master' into exceptions-v1
...
Conflicts:
phpseclib/Net/SSH2.php
2015-08-31 23:47:12 -05:00
terrafrost
e399a320dc
SSH/Agent/Identity: replace user_error's with exceptions
2015-08-31 23:36:56 -05:00
terrafrost
724ba7ccc9
SSH2: missed a few user_error's
2015-08-31 23:34:33 -05:00
terrafrost
a6fd9ea8b6
SCP: replace user_error's with exceptions
2015-08-31 23:28:20 -05:00
terrafrost
2eb4ebf11c
SSH/Agent: replace user_error's with exceptions
2015-08-31 23:23:40 -05:00
terrafrost
2e46aec03a
SFTP: replace user_error's with exceptions
2015-08-31 23:12:33 -05:00
terrafrost
453e6fcf18
RSA: some of the exceptions being thrown weren't valid
2015-08-31 22:44:41 -05:00
terrafrost
abbee318cc
X509: updates to getOID() as suggested by bantu
2015-08-31 15:20:38 -05:00
terrafrost
d7d9d782b0
X509: add getOID() method
2015-08-29 22:15:04 -05:00
Andreas Fischer
54a1aeeefe
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/RSA: add PSS test
RSA: fix regression for PSS signatures
2015-08-13 14:37:15 -04:00
Andreas Fischer
f29805e394
Merge pull request #759 from bantu/ssh2-function-key_exchange-no-static
...
[2.0] SSH2: Remove all static variables as loadable classes may change at runtime.
* bantu/ssh2-function-key_exchange-no-static:
SSH2: Remove all static variables as loadable classes may change at runtime.
2015-08-13 14:25:21 -04:00
terrafrost
15c9f99721
RSA: fix regression for PSS signatures
2015-08-11 07:27:56 -05:00
terrafrost
c6e9dce8d6
rm accidentally committed zip file
2015-08-03 23:24:59 -05:00
terrafrost
33685080fb
Merge branch '1.0' into 2.0
...
Conflicts:
composer.json
2015-08-03 23:23:10 -05:00
terrafrost
844134df95
update phpseclib to 1.0.0
2015-08-03 21:22:12 -05:00
Andreas Fischer
cd57bf31ae
Add bootstrap.php checking environment (MB_OVERLOAD_STRING).
2015-08-03 17:07:20 +02:00
terrafrost
f300e825b0
SSH2: replace user_error's with exceptions
2015-08-01 08:01:43 -05:00
terrafrost
80d84d1009
ASN1/X509: throw exceptions instead of user_errors
2015-07-30 07:33:19 -05:00
terrafrost
e264a3835e
rm unused exception
2015-07-28 20:17:32 -05:00
terrafrost
ebe9301efa
RSA: replace user_error's with Exceptions
2015-07-28 19:41:32 -05:00
Andreas Fischer
fe5671fef7
SSH2: Remove all static variables as loadable classes may change at runtime.
2015-07-28 12:05:19 +02:00
Andreas Fischer
4244576104
[2.0] Add _encryption_algorithm_to_crypt_instance method.
2015-07-28 11:44:39 +02:00
Andreas Fischer
58f8affcad
SSH2: Add support for curve25519-sha256@libssh.org.txt via libsodium-php.
2015-07-27 22:58:59 +02:00
Andreas Fischer
27be192189
Merge branch '1.0' into 2.0
...
* 1.0:
Add encryption_algorithm_to_key_size method.
2015-07-27 22:08:06 +02:00
Andreas Fischer
65010d08e6
Add encryption_algorithm_to_key_size method.
2015-07-24 12:31:50 +02:00
Andreas Fischer
650a4ce266
Merge pull request #748 from terrafrost/ssh-custom-socket-2.0
...
SSH2: make it so you can connect using open sockets / 2.0 branch
* terrafrost/ssh-custom-socket-2.0:
SSH2: move where $host is defined
SSH2: make it so you can connect using open sockets
2015-07-21 12:53:32 +02:00
Andreas Fischer
06ec04e3fe
Merge pull request #746 from terrafrost/ssh-custom-socket-1.0
...
SSH2: make it so you can connect using open sockets / 1.0 branch
* terrafrost/ssh-custom-socket-1.0:
SSH2: move where $host is defined
SSH2: make it so you can connect using open sockets
2015-07-21 12:53:24 +02:00
terrafrost
081f2cb825
Random: replace user_error with exception
2015-07-18 00:50:59 -05:00
terrafrost
0565700461
Crypt/Base: use the built-in spl exceptions instead
2015-07-17 23:23:24 -05:00
Andreas Fischer
713a9c7ccf
Merge branch '1.0' into 2.0
...
* 1.0:
SSH2: Introduce _array_intersect_first function.
Conflicts:
phpseclib/Net/SSH2.php
2015-07-18 01:06:09 +02:00
Andreas Fischer
1473da35e6
SSH2: Introduce _array_intersect_first function.
...
+ No more empty for-loop bodies
+ No more counting variables $i leaked into outer context
+ No more unintuitive $i == count(...) comparisons
+ No more array / hash table access of the form $kex_algorithms[$i]
- Function call overhead; not in the performance critical path, though.
2015-07-17 22:28:32 +02:00
terrafrost
690704d36e
Merge branch 'ssh-custom-socket-1.0' into ssh-custom-socket-2.0
...
Conflicts:
phpseclib/Net/SSH2.php
2015-07-17 13:11:57 -05:00
terrafrost
a19e2a0d21
SSH2: move where $host is defined
2015-07-17 13:08:24 -05:00
terrafrost
4d086bee86
Merge branch 'ssh-custom-socket-1.0' into ssh-custom-socket-2.0
...
Conflicts:
phpseclib/Net/SSH2.php
2015-07-17 12:43:50 -05:00
terrafrost
33a97391bc
SSH2: make it so you can connect using open sockets
2015-07-17 12:30:44 -05:00
Andreas Fischer
d9e9504fba
Merge branch 'PSR2-1.0' into PSR2-2.0
...
* PSR2-1.0:
Fix indentation phpcbf did not fix.
Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
Use phpcbf to fix PHP code to ruleset.
Ignore coding guidelines in ANSI switch block.
Base code sniffer ruleset on PSR2 rather than PEAR.
Update PHP Code Sniffer to 2.3.3
Conflicts:
build/code-sniffer-ruleset-tests.xml
build/code-sniffer-ruleset.xml
composer.lock
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RSA.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
tests/Unit/Crypt/TwofishTest.php
2015-07-17 13:41:59 +02:00
Andreas Fischer
847082ac74
Fix indentation phpcbf did not fix.
2015-07-17 12:57:41 +02:00
Andreas Fischer
5eb205b237
Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
2015-07-17 12:57:41 +02:00
Andreas Fischer
2013a31ecd
Use phpcbf to fix PHP code to ruleset.
2015-07-17 12:57:41 +02:00
Andreas Fischer
6c76df46d4
Ignore coding guidelines in ANSI switch block.
2015-07-17 12:57:05 +02:00
Andreas Fischer
4b5cc0c286
Merge branch '1.0' into 2.0
...
* 1.0:
SFTP: stat cache updates
2015-07-17 12:45:42 +02:00
terrafrost
862b63e9e5
SFTP: stat cache updates
2015-07-17 12:34:56 +02:00
Andreas Fischer
feea435071
Merge pull request #741 from terrafrost/x509-serialnumber-2.0
...
X509: use a random serial number for 2.0 branch
* terrafrost/x509-serialnumber-2.0:
X509: add a comment to explain the bitmask
X509: move where Crypt/Random loading is done
X509: use a random serial number
2015-07-17 12:31:10 +02:00
Andreas Fischer
12ccc402b1
Merge pull request #740 from terrafrost/x509-serialnumber-1.0
...
X509: use a random serial number for 1.0 branch
* terrafrost/x509-serialnumber-1.0:
X509: add a comment to explain the bitmask
X509: move where Crypt/Random loading is done
X509: use a random serial number
2015-07-17 12:30:53 +02:00
Andreas Fischer
6cbe537ba6
Merge branch '1.0' into 2.0
...
* 1.0:
SSH2: limit the size of data that expect() looks at
Conflicts:
phpseclib/Net/SSH2.php
2015-07-17 11:17:32 +02:00
terrafrost
365c687f04
Merge branch 'x509-serialnumber-1.0' into x509-serialnumber-2.0
...
Conflicts:
phpseclib/File/X509.php
2015-07-17 00:53:45 -05:00
terrafrost
0d3a117608
X509: add a comment to explain the bitmask
2015-07-17 00:45:20 -05:00
terrafrost
ee619e8f47
Merge branch 'x509-serialnumber-1.0' into x509-serialnumber-2.0
...
Conflicts:
phpseclib/File/X509.php
2015-07-16 11:53:15 -05:00
terrafrost
693804e62a
X509: move where Crypt/Random loading is done
2015-07-16 11:50:22 -05:00
terrafrost
374f8db2e3
X509: use a random serial number
2015-07-16 11:31:20 -05:00
terrafrost
51700b6065
Exceptions: more CS adjustments
2015-07-15 13:44:48 -05:00
terrafrost
50e8230350
Exceptions: CS adjustment
2015-07-15 13:23:22 -05:00
terrafrost
3cb0248f99
Crypt/Base: add initial exception support
...
To accomodate this decrypt() can no longer return false. If padding is enabled and the padding length is invalid (the only condition under which false was returned) an InvalidInputException will be thrown.
Also, previously, when encrypting, if the padding was disabled and the plaintext wasn't a multiple of the block size a E_USER_NOTICE would be issued via user_error() and then padding would be enabled. Now it's not enabled - an exception is thrown suggesting that you might want to enable padding and that's that.
2015-07-15 12:50:57 -05:00
terrafrost
4dc79b96ed
SSH2: limit the size of data that expect() looks at
2015-07-14 19:05:52 -05:00
Andreas Fischer
f2773847a2
Merge branch '1.0' into 2.0
...
* 1.0:
Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256}
Conflicts:
phpseclib/Net/SSH2.php
2015-07-08 15:45:53 +02:00
Andreas Fischer
cdda621903
Merge pull request #714 from bantu/diffie-hellman-group-exchange-sha256
...
Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256}
* bantu/diffie-hellman-group-exchange-sha256:
Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256}
2015-07-08 15:43:46 +02:00
Andreas Fischer
abeda5237f
Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256}
2015-07-08 00:00:40 +02:00
Andreas Fischer
f782005a3f
Merge branch '1.0' into 2.0
...
* 1.0:
SFTP: don't update stat cache when it's been disabled
2015-07-06 23:48:28 +02:00
Andreas Fischer
7f1dfba50d
Merge pull request #730 from terrafrost/disable-stat-cache-1.0
...
SFTP: don't update stat cache when it's been disabled
* terrafrost/disable-stat-cache-1.0:
SFTP: don't update stat cache when it's been disabled
2015-07-06 23:48:28 +02:00
Andreas Fischer
83cac3385b
Merge branch '1.0' into 2.0
...
* 1.0:
SFTP: update how recursive delete's update stat cache
Tests/SFTP: add unit test
2015-07-06 23:38:10 +02:00
Andreas Fischer
643103449c
Merge pull request #731 from terrafrost/sftp-recur-delete-stat-cache-1.0
...
SFTP: delete stat cache for recursive deletes / 1.0 branch
* terrafrost/sftp-recur-delete-stat-cache-1.0:
SFTP: update how recursive delete's update stat cache
Tests/SFTP: add unit test
2015-07-06 23:37:55 +02:00
terrafrost
c460e511a0
SFTP: update how recursive delete's update stat cache
2015-07-04 13:09:26 -05:00
terrafrost
109ae38e48
SFTP: don't update stat cache when it's been disabled
2015-07-04 12:19:35 -05:00
Andreas Fischer
727677d4e1
Merge pull request #713 from bantu/SFTPStreamTest
...
[1.0] Various fixes to fopen mode handling in SFTP Stream
* bantu/SFTPStreamTest:
Explicitly set size to 0 when creating or truncating.
mode[0] of 'c' is not supposed to truncate.
Need to create the file when it does not exist and mode[0] is not 'r'.
Add SFTPStreamTest::testFopenFcloseCreatesFile()
2015-07-04 14:28:06 +02:00
Andreas Fischer
ba46db1758
Merge pull request #713 from bantu/SFTPStreamTest
...
Various fixes to fopen mode handling in SFTP Stream
* bantu/SFTPStreamTest:
Explicitly set size to 0 when creating or truncating.
mode[0] of 'c' is not supposed to truncate.
Need to create the file when it does not exist and mode[0] is not 'r'.
Add SFTPStreamTest::testFopenFcloseCreatesFile()
Conflicts:
tests/Functional/Net/SFTPLargeFileTest.php
2015-07-04 01:18:19 +02:00
Andreas Fischer
483c253879
Merge branch '1.0' into 2.0
...
* 1.0:
X509: set one more parameter to null
X509: set another parameters field to null
2015-06-30 12:27:06 +02:00
terrafrost
77c757d095
X509: set one more parameter to null
2015-06-29 22:10:18 -05:00
terrafrost
6c2798be90
X509: set another parameters field to null
2015-06-29 21:53:27 -05:00
terrafrost
815f443ed1
Merge branch 'x509-rsa-null-1.0' into x509-rsa-null-2.0-2
...
Conflicts:
tests/Unit/File/X509/X509Test.php
2015-06-28 16:10:40 -05:00
terrafrost
46a3c0fbbb
X509: set parameter field to null for RSA keys
2015-06-28 11:32:42 -05:00
Andreas Fischer
e1dd7e9d69
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/SFTP: $lstat->$stat
Tests/SFTP: just check to see that stat / lstat return an array
SFTP: update conditions under which cache for lstat / . is used
Tests/SFTP: add test for stat's on .
2015-06-27 21:59:45 +02:00
Andreas Fischer
1ad66ad1ea
Merge pull request #719 from terrafrost/lstat-fix-1.0
...
SFTP: update conditions under which cache for lstat / . is used for 1.0 branch
* terrafrost/lstat-fix-1.0:
Tests/SFTP: $lstat->$stat
Tests/SFTP: just check to see that stat / lstat return an array
SFTP: update conditions under which cache for lstat / . is used
Tests/SFTP: add test for stat's on .
2015-06-27 21:59:45 +02:00
Andreas Fischer
89cf423c58
Merge branch '1.0' into 2.0
...
* 1.0:
SSH2: fix for window sizes > 2,147,483,648
2015-06-27 21:58:45 +02:00
terrafrost
d1d415618a
SFTP: update conditions under which cache for lstat / . is used
2015-06-26 23:34:14 -05:00
Andreas Fischer
d71da6b02b
Explicitly set size to 0 when creating or truncating.
2015-06-25 14:26:35 +02:00
Andreas Fischer
9e07fb704b
mode[0] of 'c' is not supposed to truncate.
2015-06-25 14:24:58 +02:00
Andreas Fischer
f0957021a1
Need to create the file when it does not exist and mode[0] is not 'r'.
2015-06-25 14:24:18 +02:00
terrafrost
c0555581e7
SSH2: fix for window sizes > 2,147,483,648
2015-06-24 23:45:14 -05:00
terrafrost
26059aa444
Merge branch '2.0' of git://github.com/phpseclib/phpseclib into stat-cache-fix-2.0
2015-06-20 21:15:55 -05:00
terrafrost
4d82df3fc7
Merge branch 'stat-cache-fix-1.0' into stat-cache-fix-2.0
...
Conflicts:
tests/Functional/Net/SFTPUserStoryTest.php
2015-06-20 19:59:48 -05:00
terrafrost
6bc3513914
SFTP: stat cache updates
2015-06-20 19:33:19 -05:00
Andreas Fischer
ecdd97f8a8
Merge pull request #702 from terrafrost/asn1-fix-2.0
...
ASN1 parsing fix for issue mainly effecting CSR's for 2.0 branch
* terrafrost/asn1-fix-2.0:
Tests/X509: PHP5 adjustments
ASN1: handle malformed input better
Tests/X509/CSR: add unit test for ASN1 changes
ASN1: constructed context-specific tags can have x sub elements
2015-06-16 16:30:46 +02:00
Andreas Fischer
a79b4ac6ad
Merge pull request #699 from terrafrost/asn1-fix-1.0
...
ASN1 parsing fix for issue mainly effecting CSR's for 1.0 branch
* terrafrost/asn1-fix-1.0:
ASN1: handle malformed input better
Tests/X509/CSR: add unit test for ASN1 changes
ASN1: constructed context-specific tags can have x sub elements
2015-06-16 16:30:35 +02:00
terrafrost
4e5ca26342
RC4: re-add the OpenSSL changes for RC4
...
looks like they got skipped over when the merge conflict was resolved
2015-06-10 07:10:03 -05:00
Andreas Fischer
902e41a2a4
Merge pull request #693 from terrafrost/rsa-none-2.0
...
add "none" encryption mode for 2.0 branch
* terrafrost/rsa-none-2.0:
Tests/RSA: pack expected result
Tests/RSA: pack expected result
Tests/RSA: re-added accidentally removed $rsa initialization
Tests/RSA: use correct constant
Tests/RSA: fix error
Tests/RSA: hard-coded key and result
RSA: add "none" encryption mode
2015-06-09 17:19:16 +02:00
Andreas Fischer
956607d4e0
Merge pull request #692 from terrafrost/rsa-none-1.0
...
add "none" encryption mode for 1.0 branch
* terrafrost/rsa-none-1.0:
Tests/RSA: pack expected result
Tests/RSA: re-added accidentally removed $rsa initialization
Tests/RSA: fix error
Tests/RSA: hard-coded key and result
RSA: add "none" encryption mode
2015-06-09 17:18:47 +02:00
terrafrost
22b10c6a3a
Merge branch 'asn1-fix-1.0' into asn1-fix-2.0
2015-06-07 10:24:11 -05:00
terrafrost
11000a93b9
ASN1: handle malformed input better
2015-06-07 09:59:13 -05:00
terrafrost
d3a5398fe4
ASN1: constructed context-specific tags can have x sub elements
...
previously it only worked for when there was one sub element.
2015-06-03 23:48:43 -05:00
terrafrost
30260f3321
Merge branch 'rsa-none-1.0' into rsa-none-2.0
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-05-25 22:36:10 -05:00
terrafrost
1d924cfc7b
RSA: add "none" encryption mode
2015-05-25 22:30:38 -05:00
terrafrost
649d469c1c
ANSI: use default namespace for stdClass
2015-05-23 21:01:45 -05:00
terrafrost
6c345acc1d
ANSI: PHP5 updates
2015-05-23 18:23:40 -05:00
