terrafrost
a56e0daf07
Tests/X509: add unit test showing need for return by reference
2015-08-13 10:22:01 -05:00
terrafrost
f591962fc4
Tests/RSA: add PSS test
2015-08-11 11:47:19 -05:00
terrafrost
15c9f99721
RSA: fix regression for PSS signatures
2015-08-11 07:27:56 -05:00
Andreas Fischer
78a6a7e847
Merge branch '2.0'
...
* 2.0:
composer: Remove include path. No longer necessary due to PSR4 autoloading.
2015-08-10 12:46:53 +02:00
Andreas Fischer
218164d561
Merge pull request #765 from bantu/composer-rm-include-path
...
composer: Remove include path. No longer necessary due to PSR4 autoloading
* bantu/composer-rm-include-path:
composer: Remove include path. No longer necessary due to PSR4 autoloading.
2015-08-10 12:46:52 +02:00
Andreas Fischer
3d6fc71612
composer: Remove include path. No longer necessary due to PSR4 autoloading.
2015-08-05 13:28:36 +02:00
terrafrost
bccb7db1e6
Merge branch '2.0'
2015-08-04 07:16:18 -05:00
terrafrost
761173bb7f
composer.json: rm pear-pear/PHP_Compat
2015-08-04 07:15:35 -05:00
terrafrost
580aba3988
Merge branch '2.0'
2015-08-03 23:48:36 -05:00
terrafrost
a74aa9efbe
composer.json: rm bom
2015-08-03 23:48:03 -05:00
terrafrost
10e11795df
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2015-08-03 23:26:24 -05:00
terrafrost
4c96d56303
Merge branch '2.0'
2015-08-03 23:25:28 -05:00
terrafrost
c6e9dce8d6
rm accidentally committed zip file
2015-08-03 23:24:59 -05:00
terrafrost
2d1becc950
Merge branch '2.0'
2015-08-03 23:23:49 -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
c9159add02
Merge branch '2.0'
...
* 2.0:
[2.0] Add _encryption_algorithm_to_crypt_instance method.
2015-07-29 01:09:21 +02:00
Andreas Fischer
772d4df597
Merge pull request #757 from bantu/ssh2-function-key_exchange-reduction-2.0
...
[2.0] Add _encryption_algorithm_to_crypt_instance method.
* bantu/ssh2-function-key_exchange-reduction-2.0:
[2.0] Add _encryption_algorithm_to_crypt_instance method.
2015-07-29 01:09:20 +02: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
7e25340359
Merge branch '2.0'
...
* 2.0:
SSH2: Add support for curve25519-sha256@libssh.org.txt via libsodium-php.
2015-07-28 00:56:19 +02:00
Andreas Fischer
cafaa9f5a6
Merge pull request #755 from bantu/ssh2-libsodium
...
[2.0] SSH2: Add support for curve25519-sha256@libssh.org.txt via libsodium-php.
* bantu/ssh2-libsodium:
SSH2: Add support for curve25519-sha256@libssh.org.txt via libsodium-php.
2015-07-28 00:56:19 +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
034dfb225f
Merge branch '2.0'
...
* 2.0:
Add encryption_algorithm_to_key_size method.
2015-07-27 22:08:07 +02:00
Andreas Fischer
ee16fd44ce
Merge pull request #754 from bantu/ssh2-function-key_exchange-reduction
...
[1.0] SSH2: Add encryption_algorithm_to_key_size method.
* bantu/ssh2-function-key_exchange-reduction:
Add encryption_algorithm_to_key_size method.
2015-07-27 22:08:06 +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
34b572129e
Merge branch '2.0'
...
* 2.0:
SSH2: move where $host is defined
SSH2: make it so you can connect using open sockets
2015-07-21 12:53:43 +02:00
Andreas Fischer
7c69f3f866
Merge branch '1.0' into 2.0
...
* 1.0:
2015-07-21 12:53:36 +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
2e5b6bb70e
Merge branch '2.0'
...
* 2.0:
SSH2: Introduce _array_intersect_first function.
2015-07-18 01:06:17 +02: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
a627caf691
Merge pull request #745 from bantu/array_intersect_first
...
SSH2: Introduce _array_intersect_first function.
* bantu/array_intersect_first:
SSH2: Introduce _array_intersect_first function.
2015-07-18 01:05:33 +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
f0d653a8f3
Merge branch '2.0'
...
* 2.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
2015-07-17 15:16:39 +02:00
Andreas Fischer
4a0b974a6c
Merge branch '1.0' into 2.0
...
* 1.0:
2015-07-17 15:16:31 +02:00
Andreas Fischer
8f43067d92
Merge pull request #744 from bantu/PSR2-2.0
...
[2.0] Code Sniffer: Switch from PEAR with exceptions to PSR2 with exception2
* bantu/PSR2-2.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
2015-07-17 15:16:24 +02:00
Andreas Fischer
e251f6c372
Merge pull request #732 from bantu/PSR2-1.0
...
[1.0] Code Sniffer: Switch from PEAR with exceptions to PSR2 with exceptions
* bantu/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
2015-07-17 15:16:13 +02:00
