terrafrost
361b59fff9
SSH2: make setCryptoEngine() less cumbersome
2014-10-11 23:40:56 -05:00
terrafrost
959c0cefae
SSH2: add setCryptoEngine() function
2014-10-11 23:26:46 -05:00
terrafrost
ff4d563f4f
SSH2: CS adjustments
2014-10-11 23:20:44 -05:00
terrafrost
beb3d0db79
Merge remote-tracking branch 'petrich/master' into petrich
...
Conflicts:
phpseclib/Crypt/AES.php
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/RC2.php
phpseclib/Crypt/RC4.php
phpseclib/Crypt/Rijndael.php
phpseclib/Crypt/TripleDES.php
phpseclib/Crypt/Twofish.php
2014-10-11 22:56:32 -05:00
Andreas Fischer
564c678df5
Merge pull request #487 from bantu/fix-486
...
Correct constant: NET_SFTP_BLOCK_DEVICE -> NET_SFTP_TYPE_BLOCK_DEVICE
* bantu/fix-486:
Correct constant: NET_SFTP_BLOCK_DEVICE -> NET_SFTP_TYPE_BLOCK_DEVICE
2014-10-09 23:51:28 +02:00
Andreas Fischer
ce3cf60b10
Correct constant: NET_SFTP_BLOCK_DEVICE -> NET_SFTP_TYPE_BLOCK_DEVICE
2014-10-09 23:24:30 +02:00
Andreas Fischer
3826ef608a
Merge pull request #486 from vvolodko/patch-1
...
Fix Net_SFTP::filetype() block device recognition.
* vvolodko/patch-1:
Fix Net_SFTP::filetype() block device recognition.
2014-10-09 23:19:15 +02:00
Vladimir Volodko
6715c41e1f
Fix Net_SFTP::filetype() block device recognition.
2014-10-09 12:46:58 +07:00
Andreas Fischer
c2be2b5a3b
Merge pull request #483 from cezarykluczynski/ssh2-rtrim-strip
...
SSH2: removed redundant rtrim
* cezarykluczynski/ssh2-rtrim-strip:
SSH2: removed redundant rtrim
2014-09-28 12:43:49 +02:00
Cezary Kluczyński
0692a1ea7d
SSH2: removed redundant rtrim
2014-09-28 12:39:54 +02:00
Andreas Fischer
b6b0b2dec8
Merge pull request #482 from terrafrost/gmp-56
...
BigInteger: accommodate GMP change in PHP 5.6
* terrafrost/gmp-56:
BigInteger: accomodate GMP change in PHP 5.6
2014-09-27 22:57:49 +02:00
terrafrost
a43dd38365
BigInteger: accomodate GMP change in PHP 5.6
2014-09-27 12:52:54 -05:00
Andreas Fischer
ba5101e77b
Merge pull request #480 from terrafrost/asn1-fix
...
ASN1: fix issue with non-constructed context-specific tags
* terrafrost/asn1-fix:
ASN1: fix unit test
ASN1: add unit test for non-constructed context-specific change
ASN1: fix issue with non-constructed context-specific tags
2014-09-24 16:50:03 +02:00
terrafrost
3785bebcce
ASN1: fix unit test
2014-09-24 00:07:49 -05:00
terrafrost
a2f4a2cbba
ASN1: add unit test for non-constructed context-specific change
2014-09-22 23:03:06 -05:00
terrafrost
c6ad2b69ba
ASN1: fix issue with non-constructed context-specific tags
2014-09-22 01:01:34 -05:00
terrafrost
5085202f1f
README: update download link to 0.3.8
2014-09-12 21:42:45 -05:00
Andreas Fischer
3f3b9b90fb
Merge pull request #469 from terrafrost/rsa-xml-unsigned
...
RSA: make XML keys use unsigned integers
* terrafrost/rsa-xml-unsigned:
RSA: syntax error in unit tests
RSA: make unit tests perform string comparisons sans white space chars
RSA: update unit test
RSA: add unit test
RSA: make XML keys use unsigned integers
2014-09-09 16:41:58 +02:00
terrafrost
f6bd3542b3
RSA: syntax error in unit tests
2014-09-09 00:43:28 -05:00
terrafrost
e092733808
RSA: make unit tests perform string comparisons sans white space chars
2014-09-09 00:34:41 -05:00
terrafrost
c489852332
RSA: update unit test
2014-09-09 00:28:38 -05:00
terrafrost
4329015629
RSA: add unit test
2014-09-08 22:26:14 -05:00
Andreas Fischer
f2cab55fd5
Merge pull request #470 from terrafrost/ssh2-rm-unused-constant
...
SSH2: rm unused constant
* terrafrost/ssh2-rm-unused-constant:
SSH2: rm unused constant
2014-09-07 12:43:22 +02:00
terrafrost
67279d7811
SSH2: rm unused constant
...
it doesn't need to be defined since the strlen($this->last_interactive_response)
check in _login_helper serves the same purpose that NET_SSH_MASK_LOGIN_INTERACTIVE
was intended to serve
2014-09-06 20:30:01 -05:00
terrafrost
713393c8ad
RSA: make XML keys use unsigned integers
...
PKCS1 / PKCS8 keys need *signed* integers because of section 8.3.3
at http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=7
2014-09-06 11:13:11 -05:00
Andreas Fischer
2ef5a00dff
Merge pull request #464 from bantu/runkit-php5.6
...
Restore runkit on Travis CI PHP 5.6.
* bantu/runkit-php5.6:
runkit: Provide alternative repository for PHP 5.6.
runkit: Change git from git:// to https://
2014-09-04 22:59:18 +02:00
Andreas Fischer
e8ccb7a995
Merge pull request #466 from bantu/asn1-handle-indef-lengths-tests-fixup
...
ASN1Test: Use assertSame and the correct parameter order.
* bantu/asn1-handle-indef-lengths-tests-fixup:
ASN1Test: Even better, use assertCount instead of assertSame.
ASN1Test: The expected value comes first in assertEquals/assertSame.
ASN1Test: Also check the type by using assertSame instead of assertEquals.
2014-09-04 22:53:57 +02:00
Andreas Fischer
3fc86d641c
runkit: Provide alternative repository for PHP 5.6.
2014-09-04 22:47:48 +02:00
Andreas Fischer
9c3ce656f4
ASN1Test: Even better, use assertCount instead of assertSame.
2014-09-04 22:33:41 +02:00
Andreas Fischer
8e3b83af56
ASN1Test: The expected value comes first in assertEquals/assertSame.
2014-09-04 22:27:33 +02:00
Andreas Fischer
7c2b399915
ASN1Test: Also check the type by using assertSame instead of assertEquals.
2014-09-04 22:26:37 +02:00
Andreas Fischer
5e9d41f403
Merge pull request #462 from terrafrost/asn1-handle-indef-lengths
...
ASN1: rewrite _decode_der
* terrafrost/asn1-handle-indef-lengths:
ASN1: one more unit test change
ASN1: another unit test update
ASN1: unit test adjustments
ASN1: cs adjustments to unit test
ASN1: add unit tests for indefinite length decoding
ASN1: CS adjustment (rm whitespace at eol)
ASN1: rewrite _decode_der
2014-09-04 22:20:27 +02:00
Andreas Fischer
7b665a18a1
runkit: Change git from git:// to https://
2014-09-04 04:23:11 +02:00
terrafrost
bb6d5d9bc0
ASN1: one more unit test change
2014-09-03 20:54:24 -05:00
terrafrost
8293b66136
ASN1: another unit test update
2014-09-03 20:28:07 -05:00
terrafrost
34866bf095
ASN1: unit test adjustments
2014-09-03 19:30:42 -05:00
Andreas Fischer
9774ee58d1
Merge pull request #463 from terrafrost/ssh-window-size-changes
...
SSH2: don't count data length against window size
* terrafrost/ssh-window-size-changes:
SSH2: don't count data length against window size
2014-09-03 20:44:41 +02:00
terrafrost
36b4b13863
ASN1: cs adjustments to unit test
2014-09-03 00:36:43 -05:00
terrafrost
871e1a3070
ASN1: add unit tests for indefinite length decoding
2014-09-03 00:29:04 -05:00
terrafrost
3bb123c3d5
ASN1: CS adjustment (rm whitespace at eol)
2014-08-30 19:44:12 -05:00
terrafrost
9e71e0bce8
SSH2: don't count data length against window size
...
it is my hope that the issues 8c9e7a890e
and ccb1c3e2bd
sought to resolve were
fixed 9f8d8a7bf6
and
7a2c7a414c
.
2014-08-30 15:26:23 -05:00
terrafrost
e258e001fa
ASN1: rewrite _decode_der
...
this rewrite makes phpseclib better able to handle indef lengths,
which had previously been untested.
2014-08-25 10:12:56 -05:00
Andreas Fischer
e0868df0ec
Merge pull request #460 from kroleg/patch-1
...
Error: "Constant CRYPT_RSA_MODE already defined"
* kroleg/patch-1:
Replaced "case true:" with "default:"
Error: "Constant CRYPT_RSA_MODE already defined"
2014-08-25 15:16:23 +02:00
Vitaliy Zaytsev
2ee0529c9d
Replaced "case true:" with "default:"
2014-08-25 19:58:38 +07:00
Vitaliy Zaytsev
cf10e07660
Error: "Constant CRYPT_RSA_MODE already defined"
...
It happens if defined(MATH_BIGINTEGER_OPENSSL_DISABLE) && !function_exists('openssl_pkey_get_details')
2014-08-25 19:03:24 +07:00
Andreas Fischer
7696cbf826
Merge pull request #456 from terrafrost/sftp-resources
...
SFTP: make it so files can be downloaded into resources or upload from resources
* terrafrost/sftp-resources:
SFTP: cs adjustment
SFTP: optimize conditional calls to fclose in get() method
SFTP: grammar
SFTP: fix issue with uploading via a resource
SFTP: make it so files can be downloaded into resources or upload from resources
2014-08-19 22:25:02 +02:00
terrafrost
74feca9cf2
SFTP: cs adjustment
2014-08-19 14:20:20 -05:00
terrafrost
cb66c561c2
SFTP: optimize conditional calls to fclose in get() method
2014-08-19 14:05:24 -05:00
terrafrost
29e0143308
SFTP: grammar
2014-08-16 15:49:38 -05:00
terrafrost
7ed53f2428
SFTP: fix issue with uploading via a resource
2014-08-16 13:56:34 -05:00