Andreas Fischer
a39da4dba3
Merge pull request #367 from terrafrost/ssh-mac-algo
...
SSH2: make $mac_algorithms non-static
* terrafrost/ssh-mac-algo:
SSH2: make $mac_algorithms non-static
2014-06-11 07:48:57 +02:00
terrafrost
246e9e154f
SSH2: make $mac_algorithms non-static
...
none of the other statically defined variables have the potential
to change as multiple Net_SSH2 objects are created but this one does.
ie. if you connect to one SSH-2.0-SSHD server then no subsequent server
will use hmac-sha1-96 even if it could
2014-06-10 23:08:56 -05:00
Andreas Fischer
6e796d091a
Merge pull request #364 from terrafrost/sftp-sort2
...
SFTP: add the ability for nlist() and rawlist() to be sorted
* terrafrost/sftp-sort2:
SFTP: update one last comment
SFTP: update unit test comments
SFTP: add new line to end of unit test
SFTP: assertEquals -> assertSame
SFTP: reset sort options every time and update unit test
SFTP: rm whitespace
SFTP: define $sortOptions
SFTP: add the ability for nlist() and rawlist() to be sorted
2014-06-09 20:19:33 +02:00
terrafrost
3ded2d9f81
SFTP: update one last comment
2014-06-09 11:33:17 -05:00
terrafrost
0cb6fbc983
SFTP: update unit test comments
2014-06-09 09:46:31 -05:00
terrafrost
fb1dbbf75c
SFTP: add new line to end of unit test
2014-06-09 09:44:27 -05:00
terrafrost
c8343e77c7
SFTP: assertEquals -> assertSame
2014-06-09 09:42:07 -05:00
terrafrost
0e2b2a416b
SFTP: reset sort options every time and update unit test
2014-06-09 09:22:30 -05:00
terrafrost
8dff207ed3
SFTP: rm whitespace
2014-06-05 15:06:50 -05:00
terrafrost
8c0f710083
SFTP: define $sortOptions
2014-06-05 10:50:13 -05:00
terrafrost
b64573f4b5
SFTP: add the ability for nlist() and rawlist() to be sorted
2014-06-05 09:56:49 -05:00
Andreas Fischer
25d31e5867
Merge pull request #362 from terrafrost/spkac
...
X509: add signSPKAC() and saveSPKAC() methods
* terrafrost/spkac:
X509: Unit test CS changes
X509: move location of SPKAC unit test
X509: CS adjustments
X509: PHP4 compat changes
RSA: PHP4 compat changes
X509: rm trailing white space from unit test
X509: add SPKAC unit test
X509: add signSPKAC() and saveSPKAC() methods
2014-06-05 16:56:34 +02:00
terrafrost
231566c1fb
X509: Unit test CS changes
2014-06-05 09:23:22 -05:00
terrafrost
4a98679519
X509: move location of SPKAC unit test
2014-06-05 09:03:17 -05:00
terrafrost
daa466db94
Merge branch 'master' of https://github.com/phpseclib/phpseclib into spkac
2014-06-05 08:40:49 -05:00
terrafrost
b1ad911d20
X509: CS adjustments
2014-06-05 08:33:27 -05:00
terrafrost
aabc5cf822
X509: PHP4 compat changes
2014-06-05 08:10:52 -05:00
terrafrost
af0040b813
RSA: PHP4 compat changes
2014-06-05 08:10:20 -05:00
terrafrost
0cc6383c32
X509: rm trailing white space from unit test
2014-06-04 00:22:46 -05:00
terrafrost
75a045bec4
X509: add SPKAC unit test
2014-06-04 00:11:57 -05:00
terrafrost
dce03bb003
X509: add signSPKAC() and saveSPKAC() methods
2014-06-03 23:44:09 -05:00
Andreas Fischer
8b7a605c0f
Merge pull request #359 from bantu/ticket/301
...
Adjust documentation to coding guidelines: No () around include.
* bantu/ticket/301:
Adjust documentation to coding guidelines: No () around include.
2014-06-02 12:51:21 +02:00
Andreas Fischer
e6f87318f5
Adjust documentation to coding guidelines: No () around include.
2014-06-01 23:28:49 +02:00
Andreas Fischer
07e1f954de
Merge pull request #325 from terrafrost/rsa-public-key
...
RSA: auto-detect public keys vs private keys
* terrafrost/rsa-public-key:
RSA: update unit test file
RSA: auto-detect public keys vs private keys
2014-06-01 22:17:38 +02:00
Andreas Fischer
c7d4fd937e
Merge pull request #358 from bantu/ticket/321
...
Reimplement testGenerateIdentifier
* bantu/ticket/321:
Reimplement testGenerateIdentifier to fix #321
2014-06-01 22:00:08 +02:00
Andreas Fischer
602606d966
Merge pull request #356 from bantu/test-directory-reorganisation
...
Split Unit/Functional Test Suites.
* bantu/test-directory-reorganisation:
Split Unit/Functional Test Suites.
2014-06-01 21:56:57 +02:00
Andreas Fischer
bb3c2ca28d
Merge pull request #355 from bantu/scrutinizer-coverage
...
Scrutinizer CI code coverage
* bantu/scrutinizer-coverage:
Specify the runs option for external code coverage.
No Scrutinizer Code Coverage on HHVM either.
Extract into upload-code-coverage-scrutinizer.sh
Add -html suffix to existing code-coverage shell script.
Configure Scrutinizer CI to expect external code coverage data.
Upload clover.xml from Travis CI into Scrutinizer CI.
Produce a clover.xml code coverage file.
2014-06-01 21:55:25 +02:00
Andreas Fischer
83ddfe09a6
Reimplement testGenerateIdentifier to fix #321
2014-06-01 21:49:40 +02:00
Andreas Fischer
4af647f170
Split Unit/Functional Test Suites.
2014-06-01 21:13:20 +02:00
Andreas Fischer
3cda317862
Specify the runs option for external code coverage.
2014-06-01 13:52:24 +02:00
Andreas Fischer
825cd124aa
No Scrutinizer Code Coverage on HHVM either.
...
Fatal error: Uncaught exception 'PharException' with message 'Corrupt phar, can't read 4 bytes starting at offset 1663508419' in :
Stack trace:
0 (): Phar::bytesToInt()
1 (): Phar->parsePhar()
2 (): Phar->__construct()
3 /home/travis/build/phpseclib/phpseclib/ocular.phar(9): Phar::mapPhar()
4 {main}
2014-06-01 13:50:54 +02:00
Andreas Fischer
33e62401c3
Extract into upload-code-coverage-scrutinizer.sh
2014-06-01 13:49:15 +02:00
Andreas Fischer
b5fed807f3
Add -html suffix to existing code-coverage shell script.
2014-06-01 13:45:51 +02:00
Andreas Fischer
2c00f074e5
Configure Scrutinizer CI to expect external code coverage data.
2014-06-01 13:29:37 +02:00
Andreas Fischer
a29b46693c
Upload clover.xml from Travis CI into Scrutinizer CI.
2014-06-01 13:29:37 +02:00
Andreas Fischer
8aa17c285c
Produce a clover.xml code coverage file.
2014-06-01 13:12:42 +02:00
Andreas Fischer
eb12b347b7
Merge pull request #353 from terrafrost/biginteger-function-exists
...
BigInteger: "be less overly clever loading Crypt/Random"
* terrafrost/biginteger-function-exists:
BigInteger: "be less overly clever loading Crypt/Random"
2014-05-30 15:50:36 +02:00
Andreas Fischer
6805704b4f
Merge pull request #352 from terrafrost/sftp-stream-changes
...
SFTP Stream changes
* terrafrost/sftp-stream-changes:
SFTP/Stream: fix capatilization
SFTP/Stream: add explanation as to why nlist() is used here
SFTP/Stream: use $scheme instead of 'sftp'
2014-05-30 00:00:04 +02:00
terrafrost
7252017268
SFTP/Stream: fix capatilization
2014-05-29 16:49:04 -05:00
terrafrost
7c08ab71d3
BigInteger: "be less overly clever loading Crypt/Random"
...
pretty much the same as this commit:
28f18f83ec
2014-05-29 16:31:26 -05:00
terrafrost
c0e3795319
SFTP/Stream: add explanation as to why nlist() is used here
2014-05-29 16:23:28 -05:00
terrafrost
3dd92e56e4
SFTP/Stream: use $scheme instead of 'sftp'
...
This makes it easier for someone to change the scheme (which can be
done by changng the stream_wrapper_register call at the bottom
of the file)
2014-05-29 16:14:03 -05:00
Andreas Fischer
aa5f9b77ec
Merge pull request #349 from terrafrost/ssh2-exec-callback-termination
...
SSH2: make it so callback functions can make exec() return early
* terrafrost/ssh2-exec-callback-termination:
SSH2: 0x7FFFFFFF -> $this->window_size in one more place
SSH2: make it so callback functions can make exec() return early
2014-05-28 00:39:40 +02:00
Andreas Fischer
fc57e3f9c9
Merge pull request #348 from terrafrost/more-sftp-changes
...
More sftp changes
* terrafrost/more-sftp-changes:
SFTP: NULL -> null
SFTP: fix syntax error
SFTP: add more stat functions
2014-05-28 00:02:20 +02:00
Andreas Fischer
05b265d791
Merge pull request #350 from terrafrost/crypt-random-string-function-exists
...
Random: wrap crypt_random_string in a function_exists call
* terrafrost/crypt-random-string-function-exists:
Random: wrap crypt_random_string in a function_exists call
2014-05-27 12:24:52 +02:00
terrafrost
015d628183
Random: wrap crypt_random_string in a function_exists call
2014-05-26 18:32:36 -05:00
terrafrost
db32efb276
SSH2: 0x7FFFFFFF -> $this->window_size in one more place
2014-05-26 17:57:14 -05:00
terrafrost
0dd929341b
SSH2: make it so callback functions can make exec() return early
2014-05-26 17:37:32 -05:00
terrafrost
c100264b65
SFTP: NULL -> null
2014-05-26 16:32:57 -05:00
terrafrost
46ae0da314
SFTP: fix syntax error
2014-05-26 15:42:14 -05:00