Andreas Fischer
c0bdf1bd90
CS: Fix "PEAR.Functions.FunctionCallSignature.Indent" sniff.
2014-04-24 00:26:02 +02:00
Andreas Fischer
b3081f2a61
Merge branch 'master' into php5
...
* master:
SSH2: improve handling of incomplete packets
2014-04-19 15:46:56 +02:00
Andreas Fischer
b90deb5e83
Merge pull request #328 from terrafrost/get_binary_packet
...
SSH2: improve handling of incomplete packets
* terrafrost/get_binary_packet:
SSH2: improve handling of incomplete packets
2014-04-19 15:44:29 +02:00
Andreas Fischer
d107d43ec3
Merge branch 'master' into php5
...
* master:
Make build script exit with non-zero status when sniff fails.
2014-04-19 15:37:06 +02:00
Andreas Fischer
0886808b2e
Merge pull request #330 from bantu/phing-sniff-fail
...
Make build script exit with non-zero status when sniff fails.
* bantu/phing-sniff-fail:
Make build script exit with non-zero status when sniff fails.
2014-04-19 15:37:01 +02:00
Andreas Fischer
81982ef86e
Make build script exit with non-zero status when sniff fails.
2014-04-19 15:27:59 +02:00
Andreas Fischer
5cfe1560a0
Merge branch 'master' into php5
...
* master:
BigInteger: explain precense of uncallable code
2014-04-19 14:05:12 +02:00
Andreas Fischer
a7c6de08a8
Merge pull request #329 from terrafrost/biginteger-comments
...
BigInteger: explain precense of uncallable code
* terrafrost/biginteger-comments:
BigInteger: explain precense of uncallable code
2014-04-19 14:05:04 +02:00
terrafrost
0cbb631852
BigInteger: explain precense of uncallable code
2014-04-18 23:43:03 -05:00
terrafrost
efd3b96dc8
SSH2: improve handling of incomplete packets
2014-04-18 16:58:00 -05:00
terrafrost
d9d224572b
RSA: update unit test file
2014-04-18 11:41:08 -05:00
Andreas Fischer
b471d7bc3e
Merge branch 'master' into php5
...
* master:
Remove space at end of line in tests/File/ASN1/DevTest.php.
2014-04-18 18:03:03 +02:00
Andreas Fischer
b9a29d8678
Merge pull request #327 from bantu/asn1-devtest-remove-space-eol
...
Remove space at end of line in tests/File/ASN1/DevTest.php.
* bantu/asn1-devtest-remove-space-eol:
Remove space at end of line in tests/File/ASN1/DevTest.php.
2014-04-18 18:02:16 +02:00
Andreas Fischer
aa96490018
Remove space at end of line in tests/File/ASN1/DevTest.php.
2014-04-18 17:47:05 +02:00
Andreas Fischer
ff72ce3078
Merge branch 'master' into php5
...
* master:
bug280 is ambiguous. Use github prefix instead.
2014-04-18 17:07:23 +02:00
Andreas Fischer
b2e1cc1b02
Merge pull request #326 from bantu/phpunit-group-source-prefix
...
bug280 is ambiguous. Use github prefix instead.
* bantu/phpunit-group-source-prefix:
bug280 is ambiguous. Use github prefix instead.
2014-04-18 17:07:21 +02:00
Andreas Fischer
a7da467819
Merge branch 'master' into php5
...
* master:
Added some simple Net_SSH2 tests
2014-04-18 16:55:42 +02:00
Andreas Fischer
b676cc2690
Merge pull request #241 from mpscholten/ssh2-tests
...
Added some simple Net_SSH2 tests
* mpscholten/ssh2-tests:
Added some simple Net_SSH2 tests
Conflicts:
tests/Net/SSH2Test.php
2014-04-18 16:54:24 +02:00
Andreas Fischer
4728823fc9
bug280 is ambiguous. Use github prefix instead.
2014-04-18 16:49:37 +02:00
Andreas Fischer
bf7abfcfce
Merge branch 'master' into php5
...
* master:
ASN1: test case updates
ASN1: add test cases for latest changes
ASN1: CS update
ASN1: make developing new ASN.1 scripts a little easier
ASN1: make it so bit string's can have an optional minimum size
ASN1: explicit application tags didn't work (although implicit ones did)
2014-04-18 16:48:05 +02:00
Andreas Fischer
14cfcc1b53
Merge pull request #310 from terrafrost/keberos-fix
...
ASN1 changes
* terrafrost/keberos-fix:
ASN1: test case updates
ASN1: add test cases for latest changes
ASN1: CS update
ASN1: make developing new ASN.1 scripts a little easier
ASN1: make it so bit string's can have an optional minimum size
ASN1: explicit application tags didn't work (although implicit ones did)
2014-04-18 16:47:48 +02:00
Andreas Fischer
d22dfbff20
Merge branch 'master' into php5
...
* master:
Use "Development Dependencies" instead of "Dependencies" for less confusion.
Capitalisation improvements.
Add Contributing section to README.md
Add section about Dependency Installation to README.md
2014-04-18 16:44:57 +02:00
Andreas Fischer
a104be4a77
Merge pull request #316 from bantu/readme-update
...
Add "Installing Dependencies" and "Contributing" sections to README.md
* bantu/readme-update:
Use "Development Dependencies" instead of "Dependencies" for less confusion.
Capitalisation improvements.
Add Contributing section to README.md
Add section about Dependency Installation to README.md
2014-04-18 16:44:43 +02:00
terrafrost
f970b69a9e
ASN1: test case updates
2014-04-17 23:53:33 -05:00
terrafrost
317efaf28a
RSA: auto-detect public keys vs private keys
2014-04-17 10:30:32 -05:00
terrafrost
27b3ea4059
ASN1: add test cases for latest changes
2014-04-16 15:18:45 -05:00
Andreas Fischer
aa7b2f0e92
Merge pull request #318 from bantu/BigInteger-setRandomGenerator-removal
...
Remove deprecated method Math_BigInteger::setRandomGenerator().
* bantu/BigInteger-setRandomGenerator-removal:
Remove deprecated method Math_BigInteger::setRandomGenerator().
2014-04-15 16:55:12 +02:00
Andreas Fischer
4fece986e3
Use "Development Dependencies" instead of "Dependencies" for less confusion.
...
There are currently no production dependencies.
2014-04-15 16:51:50 +02:00
Andreas Fischer
7348ab6ef7
Remove deprecated method Math_BigInteger::setRandomGenerator().
2014-04-13 01:04:37 +02:00
Andreas Fischer
9653e3c70f
Capitalisation improvements.
2014-04-12 20:42:15 +02:00
Andreas Fischer
a7e7f5891a
Add Contributing section to README.md
2014-04-12 20:32:32 +02:00
Andreas Fischer
670222bc31
Add section about Dependency Installation to README.md
2014-04-12 20:26:58 +02:00
Andreas Fischer
61b0fe2ddf
Merge branch 'master' into php5
...
* master:
Run Code Sniffer via phing.
Depend on phing/phing build script.
Conflicts:
composer.lock
2014-04-12 19:33:05 +02:00
Andreas Fischer
1a7e3746d5
Merge pull request #314 from bantu/codesniffer-via-phing
...
Add phing build script and run CodeSniffer from it
* bantu/codesniffer-via-phing:
Run Code Sniffer via phing.
Depend on phing/phing build script.
2014-04-12 19:30:37 +02:00
terrafrost
10be403aff
ASN1: CS update
2014-04-12 12:01:04 -05:00
Andreas Fischer
4a064a0506
Run Code Sniffer via phing.
2014-04-12 07:48:32 +02:00
Andreas Fischer
8c9b7083d8
Depend on phing/phing build script.
2014-04-12 07:47:26 +02:00
Andreas Fischer
003dcbb75e
Merge branch 'master' into php5
...
* master:
Extend segfault workaround to PHP versions below 5.4.
2014-04-12 07:23:32 +02:00
Andreas Fischer
367c856605
Merge pull request #313 from bantu/more-coverage-segfault
...
Extend segfault workaround to PHP versions below 5.4.
* bantu/more-coverage-segfault:
Extend segfault workaround to PHP versions below 5.4.
2014-04-12 07:23:23 +02:00
Andreas Fischer
96b7baa9f1
Extend segfault workaround to PHP versions below 5.4.
2014-04-12 07:13:44 +02:00
Andreas Fischer
7b7cc829d9
Merge branch 'master' into php5
...
* master:
Update composer before using it. Fixes openssl for https error.
Install PHPUnit via Composer and update to version 4.0.
2014-04-12 06:54:55 +02:00
Andreas Fischer
a7f625c6f3
Merge pull request #312 from bantu/phpunit-4-via-composer
...
Install PHPUnit via Composer and update to version 4.0.
* bantu/phpunit-4-via-composer:
Update composer before using it. Fixes openssl for https error.
Install PHPUnit via Composer and update to version 4.0.
2014-04-12 06:52:51 +02:00
Andreas Fischer
ca59f278da
Update composer before using it. Fixes openssl for https error.
2014-04-12 06:18:56 +02:00
Andreas Fischer
86d7c6830c
Install PHPUnit via Composer and update to version 4.0.
2014-04-12 04:28:11 +02:00
Andreas Fischer
1313009c9c
Merge branch 'master' into php5
...
* master:
Prevent segfault on PHP 5.3.3 by disabling GC.
2014-04-11 00:45:37 +02:00
Andreas Fischer
242cd2c319
Merge pull request #309 from bantu/php5.3.3-coverage-segfault
...
Prevent segfault on PHP 5.3.3 by disabling GC.
* bantu/php5.3.3-coverage-segfault:
Prevent segfault on PHP 5.3.3 by disabling GC.
2014-04-11 00:45:32 +02:00
Andreas Fischer
c391f52221
Prevent segfault on PHP 5.3.3 by disabling GC.
2014-04-11 00:03:02 +02:00
terrafrost
61cd5e4f5a
ASN1: make developing new ASN.1 scripts a little easier
2014-04-10 13:49:28 -05:00
Andreas Fischer
58cdf692f8
Merge branch 'master' into php5
...
* master:
SSH2: move _connect() call to _login() from login()
SSH2: phpdoc updates
SSH: clarify role of constructor / connection timeout
SSH1: do fsockopen() call when login has been called
SSH2: != -> |=
SSH2: phpdoc changes
SSH2: syntax error
SSH2: timeout set in constructor != timeout set by setTimeout()
SSH2: add phpdoc header
SSH2: connect to server in login() function
Conflicts:
phpseclib/Net/SSH2.php
2014-04-10 18:00:38 +02:00
Andreas Fischer
652788ac34
Merge pull request #308 from terrafrost/ssh2-connect-after-login
...
SSH2: connect to server in login() function
* terrafrost/ssh2-connect-after-login:
SSH2: move _connect() call to _login() from login()
SSH2: phpdoc updates
SSH: clarify role of constructor / connection timeout
SSH1: do fsockopen() call when login has been called
SSH2: != -> |=
SSH2: phpdoc changes
SSH2: syntax error
SSH2: timeout set in constructor != timeout set by setTimeout()
SSH2: add phpdoc header
SSH2: connect to server in login() function
2014-04-10 17:45:54 +02:00
