Andreas Fischer
578be7f30a
Merge branch '1.0' into 2.0
...
* 1.0:
PHP 5.2 is not supported by travis anymore
Updated dependencies
Removed old branch alias
Conflicts:
composer.json
composer.lock
2015-02-08 16:58:37 +01:00
Andreas Fischer
c8fe3c3b30
Merge pull request #620 from GrahamForks/1.0-composer
...
Remove old branch alias from 1.0 branch
* GrahamForks/1.0-composer:
PHP 5.2 is not supported by travis anymore
Updated dependencies
Removed old branch alias
2015-02-08 16:54:12 +01:00
terrafrost
05f4ec133c
CHANGELOG: add 0.3.10 release
2015-02-08 09:31:31 -06:00
Graham Campbell
e69cddae7d
PHP 5.2 is not supported by travis anymore
2015-02-07 15:44:23 +00:00
Graham Campbell
dea916189f
Updated dependencies
2015-02-07 15:35:42 +00:00
Graham Campbell
790463cbc7
Removed old branch alias
2015-02-07 15:35:37 +00:00
montdidier
1803bcac0b
moved agent forwarding channel handling to filter method and reusing existing open channels to request forwarding
2015-02-06 11:28:23 +08:00
terrafrost
87a4863304
Merge branch '2.0'
2015-02-05 07:51:08 -06:00
terrafrost
becb9524ff
Merge branch '1.0' into 2.0
2015-02-05 07:50:55 -06:00
terrafrost
c047e69d3e
README: update download link to latest version
2015-02-05 07:50:26 -06:00
montdidier
25b328c440
removed stopSSHForwarding
2015-02-05 13:19:57 +08:00
Andreas Fischer
8c2ba4c153
Merge branch '2.0'
...
* 2.0:
Adjust sami.conf.php to new branch names.
2015-02-04 18:16:50 +01:00
Andreas Fischer
eca3bb9724
Merge branch '1.0' into 2.0
...
* 1.0:
Adjust sami.conf.php to new branch names.
2015-02-04 18:16:50 +01:00
Andreas Fischer
7a6369ca24
Merge pull request #616 from bantu/sami-branches
...
Adjust sami.conf.php to new branch names.
* bantu/sami-branches:
Adjust sami.conf.php to new branch names.
2015-02-04 18:16:50 +01:00
terrafrost
755db3a72f
README: change download link to 0.3.10
...
doing this from the github.com GUI - not from a CLI git install...
2015-02-04 10:29:59 -06:00
Andreas Fischer
51580c0cb7
Adjust sami.conf.php to new branch names.
2015-02-04 16:53:39 +01:00
terrafrost
a95160cb44
Crypt/Base: fix issue with CBC mode encryption with continuous buffers
2015-01-31 19:11:32 -06:00
terrafrost
e93dc8d272
RC2: OpenSSL is pretty restricted in where it can be used
2015-01-29 23:19:34 -06:00
terrafrost
1dd1c65bfd
Merge branch 'master' into openssl-support
2015-01-29 23:00:59 -06: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
d15bba1edc
Merge pull request #315 from bantu/php5.3.3-ssh-functional-tests-reenable
...
Reenable SSH Functional Test on Travis CI PHP 5.3.3 and below.
* bantu/php5.3.3-ssh-functional-tests-reenable:
Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below).
2015-01-28 22:50:33 +01:00
Andreas Fischer
dab7380fa3
Merge pull request #611 from bantu/drop-psr0
...
composer.json: Remove PSR-0 autoload statements.
* bantu/drop-psr0:
composer.json: Remove PSR0 autoload statements.
2015-01-28 16:23:44 +01:00
Andreas Fischer
d8742488f6
Merge pull request #612 from bantu/scrutinizer-timeout
...
.scrutinizer.yml: Use large timeout to prevent coverage receiver from ti...
* bantu/scrutinizer-timeout:
.scrutinizer.yml: Use large timeout to prevent coverage receiver from timing out.
2015-01-28 16:21:58 +01:00
Andreas Fischer
c9c68c9ca2
.scrutinizer.yml: Use large timeout to prevent coverage receiver from timing out.
2015-01-28 14:36:11 +01:00
Andreas Fischer
3f7dc96a2b
composer.json: Remove PSR0 autoload statements.
2015-01-28 13:52:42 +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
terrafrost
fbfc935a1e
Tests/RC2: rm space
2015-01-26 20:06:01 -06:00
terrafrost
a467c9e0bd
Tests/RC2: use data provider
2015-01-26 19:51:57 -06:00
terrafrost
8b8d9ac423
Tests/RC2: add test vectors
2015-01-26 19:24:48 -06:00
terrafrost
808a460f15
Tests/Twofish: disable padding
2015-01-19 22:00:49 -06:00
terrafrost
06d9f07830
Tests/Twofish: fix E_NOTICE
2015-01-19 21:19:12 -06:00
terrafrost
b852e8c6cb
Tests: add twofish unit test
2015-01-19 20:52:25 -06:00
terrafrost
c90010297c
Tests/TripleDES: CS adjustments
2015-01-17 10:33:12 -06:00
terrafrost
eaf2397cb6
Tests/TripleDES: fix one last error
2015-01-17 10:17:23 -06:00
terrafrost
1547ec497a
Tests/TripleDES: another syntax error
2015-01-17 10:04:01 -06:00
terrafrost
fb41f3492b
Tests/TripleDES: fix syntax error
2015-01-17 09:56:32 -06:00
terrafrost
e9470d1fc5
TripleDES: updates to accomodate inner chaining
2015-01-17 09:42:47 -06:00
Andreas Fischer
9abd251cb2
Merge pull request #590 from cnelissen/MarkBaseAbstract
...
Mark Base as abstract
* cnelissen/MarkBaseAbstract:
Marked Base as abstract
2015-01-17 14:14:46 +01:00
terrafrost
0f01128e98
Tests/AES: change CRYPT_AES_MODE_* -> CRYPT_MODE_*
2015-01-16 20:27:43 -06:00
terrafrost
f1b41e2782
Tests/AES: pack everything
2015-01-14 22:46:46 -06:00
terrafrost
7efc032d4b
Tests/AES: pass everything through bin2hex
...
(i thought this was already being done..)
2015-01-14 21:05:34 -06:00
terrafrost
569967de20
Tests/Blowfish: CS adjustments
2015-01-14 20:28:23 -06:00
terrafrost
cd57289555
Tests/AES: attempt to fix failing unit test
2015-01-14 20:19:03 -06:00
terrafrost
009d883d4c
Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support
2015-01-14 20:13:08 -06:00
montdidier
8571d0c6d7
determining what failure to expect
2015-01-13 09:52:01 +08:00
montdidier
1ebba5b32c
Merge branch 'feature/ssh_agent_forwarding' of github.com:KrugerHeavyIndustries/phpseclib into feature/ssh_agent_forwarding
2015-01-12 17:14:14 +08:00
montdidier
dd0b3e6bd5
addresses low hanging fruit comments from terrafrost and bantu
2015-01-12 17:13:33 +08:00
Andreas Fischer
38e6196127
Merge branch 'master' into php5
...
* master:
ASN1: empty constructed context-specific tags error'd out
Conflicts:
phpseclib/File/ASN1.php
2015-01-11 16:09:50 +01:00
Andreas Fischer
fd6aa5258c
Merge pull request #606 from terrafrost/asn-csr-2
...
ASN1 / CSR fixes
* terrafrost/asn-csr-2:
ASN1: empty constructed context-specific tags error'd out
2015-01-11 16:05:19 +01:00
terrafrost
84325d415e
ASN1: empty constructed context-specific tags error'd out
...
eg. an attributes field in a CSR that's blank
2015-01-10 23:58:50 -06:00
