terrafrost
b4cf10fc94
Revert "Merge branch '2.0'"
...
This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing
changes made to 638fe6971c
2016-04-10 11:30:59 -05:00
terrafrost
4b69dcb1ca
Revert "Merge remote-tracking branch 'bantu/bootstrap'"
...
This reverts commit ef04c870e9cd57bf31ae
2016-04-10 11:25:31 -05: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
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
terrafrost
d00e20a140
Merge remote-tracking branch 'graham/1.0-phpdoc' into 2.0-phpdoc
...
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Net/SCP.php
tests/Unit/File/ASN1Test.php
2015-04-16 00:42:53 -05:00
Graham Campbell
e50cbacd4e
Fixed some phpdocs
2015-03-29 17:07:17 +01:00
Andreas Fischer
257d44331e
Merge branch 'master' into php5
...
* master:
.scrutinizer.yml: Use large timeout to prevent coverage receiver from timing out.
Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below).
2015-01-28 23:03:31 +01:00
Andreas Fischer
f908040d20
Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below).
2015-01-28 13:37:21 +01:00
Clint Nelissen
628949fb73
Namespaced classes
2014-12-15 14:29:20 -08:00
Andreas Fischer
0efae5a91e
Change copyright years from roman numeral to decimal numbers.
2014-12-10 00:04:08 +01:00
Andreas Fischer
d614274ed2
Add a few SSH2 preLogin tests.
2014-07-21 23:58:17 +02:00
terrafrost
2e06a14a8a
SSH2: rm redundant part of SSH2 unit test
2014-06-16 23:58:00 -05:00
terrafrost
bbce7c4762
SSH2: add unit test for getServerPublicHostKey
2014-06-16 18:54:26 -05:00
Andreas Fischer
4af647f170
Split Unit/Functional Test Suites.
2014-06-01 21:13:20 +02:00
