octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-28 12:10:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,981 Commits 4 Branches 123 Tags 21 MiB
9fbc0358bb
Commit Graph

1981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
04e68212fe Merge pull request #789 from terrafrost/oid-changes 
X509: add getOID() method

* terrafrost/oid-changes:
  X509: updates to getOID() as suggested by bantu
  X509: add getOID() method
 2015-09-02 15:05:53 +02:00
Andreas Fischer
07dd7955c4 Merge branch '1.0' into 2.0 
* 1.0:
  Test on php 5.5.9 too
 2015-09-02 14:52:44 +02:00
Andreas Fischer
bdd6159d82 Merge pull request #797 from GrahamCampbell/patch-1 
[1.0] Test on php 5.5.9 too

* GrahamCampbell/patch-1:
  Test on php 5.5.9 too
 2015-09-02 14:52:44 +02:00
Graham Campbell
429f08a4f4 Test on php 5.5.9 too 2015-09-01 23:12:58 +01: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
0f1d043428 Merge branch '1.0' into 2.0 
* 1.0:
  Tests/X509: add unit test showing need for return by reference
 2015-08-24 14:02:39 +02:00
Andreas Fischer
e391fdbd27 Merge pull request #772 from terrafrost/x509_unit_test 
Tests/X509: add unit test showing need for return by reference

* terrafrost/x509_unit_test:
  Tests/X509: add unit test showing need for return by reference
 2015-08-24 14:01:41 +02:00
Andreas Fischer
90a4007a93 Merge branch '1.0' into 2.0 
* 1.0:
  .travis.yml: Remove outdated comment about .scrutinizer.yml
 2015-08-18 11:40:57 -04:00
Andreas Fischer
f7f93961a5 Merge pull request #780 from bantu/scrutinizer-comment-removal-travis-yml 
.travis.yml: Remove outdated comment about .scrutinizer.yml

* bantu/scrutinizer-comment-removal-travis-yml:
  .travis.yml: Remove outdated comment about .scrutinizer.yml
 2015-08-18 11:40:56 -04:00
Andreas Fischer
de896a7169 .travis.yml: Remove outdated comment about .scrutinizer.yml 2015-08-18 00:36:36 -04:00
Andreas Fischer
93ab241c83 Merge pull request #779 from bantu/runkit-absolute-include 
Make paths to runkit_import() absolute due to lack of include path.

* bantu/runkit-absolute-include:
  Make paths to runkit_import() absolute due to lack of include path.
 2015-08-18 00:19:44 -04:00
Andreas Fischer
af939f9aa5 Make paths to runkit_import() absolute due to lack of include path. 2015-08-18 00:00:47 -04:00
Andreas Fischer
2b36d44ded Merge pull request #773 from bantu/include-biginteger-testcase 
Remove include statement from BigInteger TestCase.

* bantu/include-biginteger-testcase:
  Remove include statement from BigInteger TestCase.
 2015-08-17 10:09:00 -04:00
Andreas Fischer
785b37b505 Remove include statement from BigInteger TestCase. 
This was previously required to load MATH_BIGINTEGER_MODE_* constants, but
these are autoloadable via \phpseclib\Math\BigInteger::MODE_* now and the
include path was removed.
 2015-08-13 15:12:20 -04: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
fe8fc0701b Merge pull request #769 from terrafrost/pss-fix 
RSA: fix regression for PSS signatures

* terrafrost/pss-fix:
  Tests/RSA: add PSS test
  RSA: fix regression for PSS signatures
 2015-08-13 14:34:43 -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
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
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
761173bb7f composer.json: rm pear-pear/PHP_Compat 2015-08-04 07:15:35 -05:00
terrafrost
a74aa9efbe composer.json: rm bom 2015-08-03 23:48:03 -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
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
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
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
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
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
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