terrafrost
ebe9301efa
RSA: replace user_error's with Exceptions
2015-07-28 19:41:32 -05:00
Andreas Fischer
fe5671fef7
SSH2: Remove all static variables as loadable classes may change at runtime.
2015-07-28 12:05:19 +02:00
Andreas Fischer
4244576104
[2.0] Add _encryption_algorithm_to_crypt_instance method.
2015-07-28 11:44:39 +02:00
Andreas Fischer
58f8affcad
SSH2: Add support for curve25519-sha256@libssh.org.txt via libsodium-php.
2015-07-27 22:58:59 +02:00
Andreas Fischer
27be192189
Merge branch '1.0' into 2.0
...
* 1.0:
Add encryption_algorithm_to_key_size method.
2015-07-27 22:08:06 +02:00
Andreas Fischer
65010d08e6
Add encryption_algorithm_to_key_size method.
2015-07-24 12:31:50 +02:00
Andreas Fischer
650a4ce266
Merge pull request #748 from terrafrost/ssh-custom-socket-2.0
...
SSH2: make it so you can connect using open sockets / 2.0 branch
* terrafrost/ssh-custom-socket-2.0:
SSH2: move where $host is defined
SSH2: make it so you can connect using open sockets
2015-07-21 12:53:32 +02:00
Andreas Fischer
06ec04e3fe
Merge pull request #746 from terrafrost/ssh-custom-socket-1.0
...
SSH2: make it so you can connect using open sockets / 1.0 branch
* terrafrost/ssh-custom-socket-1.0:
SSH2: move where $host is defined
SSH2: make it so you can connect using open sockets
2015-07-21 12:53:24 +02:00
terrafrost
081f2cb825
Random: replace user_error with exception
2015-07-18 00:50:59 -05:00
terrafrost
0565700461
Crypt/Base: use the built-in spl exceptions instead
2015-07-17 23:23:24 -05:00
Andreas Fischer
713a9c7ccf
Merge branch '1.0' into 2.0
...
* 1.0:
SSH2: Introduce _array_intersect_first function.
Conflicts:
phpseclib/Net/SSH2.php
2015-07-18 01:06:09 +02:00
Andreas Fischer
1473da35e6
SSH2: Introduce _array_intersect_first function.
...
+ No more empty for-loop bodies
+ No more counting variables $i leaked into outer context
+ No more unintuitive $i == count(...) comparisons
+ No more array / hash table access of the form $kex_algorithms[$i]
- Function call overhead; not in the performance critical path, though.
2015-07-17 22:28:32 +02:00
terrafrost
690704d36e
Merge branch 'ssh-custom-socket-1.0' into ssh-custom-socket-2.0
...
Conflicts:
phpseclib/Net/SSH2.php
2015-07-17 13:11:57 -05:00
terrafrost
a19e2a0d21
SSH2: move where $host is defined
2015-07-17 13:08:24 -05: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
Andreas Fischer
d9e9504fba
Merge branch 'PSR2-1.0' into PSR2-2.0
...
* PSR2-1.0:
Fix indentation phpcbf did not fix.
Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
Use phpcbf to fix PHP code to ruleset.
Ignore coding guidelines in ANSI switch block.
Base code sniffer ruleset on PSR2 rather than PEAR.
Update PHP Code Sniffer to 2.3.3
Conflicts:
build/code-sniffer-ruleset-tests.xml
build/code-sniffer-ruleset.xml
composer.lock
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RSA.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
tests/Unit/Crypt/TwofishTest.php
2015-07-17 13:41:59 +02:00
Andreas Fischer
847082ac74
Fix indentation phpcbf did not fix.
2015-07-17 12:57:41 +02:00
Andreas Fischer
5eb205b237
Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
2015-07-17 12:57:41 +02:00
Andreas Fischer
2013a31ecd
Use phpcbf to fix PHP code to ruleset.
2015-07-17 12:57:41 +02:00
Andreas Fischer
6c76df46d4
Ignore coding guidelines in ANSI switch block.
2015-07-17 12:57:05 +02:00
Andreas Fischer
4b5cc0c286
Merge branch '1.0' into 2.0
...
* 1.0:
SFTP: stat cache updates
2015-07-17 12:45:42 +02:00
terrafrost
862b63e9e5
SFTP: stat cache updates
2015-07-17 12:34:56 +02:00
Andreas Fischer
feea435071
Merge pull request #741 from terrafrost/x509-serialnumber-2.0
...
X509: use a random serial number for 2.0 branch
* terrafrost/x509-serialnumber-2.0:
X509: add a comment to explain the bitmask
X509: move where Crypt/Random loading is done
X509: use a random serial number
2015-07-17 12:31:10 +02:00
Andreas Fischer
12ccc402b1
Merge pull request #740 from terrafrost/x509-serialnumber-1.0
...
X509: use a random serial number for 1.0 branch
* terrafrost/x509-serialnumber-1.0:
X509: add a comment to explain the bitmask
X509: move where Crypt/Random loading is done
X509: use a random serial number
2015-07-17 12:30:53 +02:00
Andreas Fischer
6cbe537ba6
Merge branch '1.0' into 2.0
...
* 1.0:
SSH2: limit the size of data that expect() looks at
Conflicts:
phpseclib/Net/SSH2.php
2015-07-17 11:17:32 +02:00
terrafrost
365c687f04
Merge branch 'x509-serialnumber-1.0' into x509-serialnumber-2.0
...
Conflicts:
phpseclib/File/X509.php
2015-07-17 00:53:45 -05:00
terrafrost
0d3a117608
X509: add a comment to explain the bitmask
2015-07-17 00:45:20 -05:00
terrafrost
ee619e8f47
Merge branch 'x509-serialnumber-1.0' into x509-serialnumber-2.0
...
Conflicts:
phpseclib/File/X509.php
2015-07-16 11:53:15 -05:00
terrafrost
693804e62a
X509: move where Crypt/Random loading is done
2015-07-16 11:50:22 -05:00
terrafrost
374f8db2e3
X509: use a random serial number
2015-07-16 11:31:20 -05:00
terrafrost
51700b6065
Exceptions: more CS adjustments
2015-07-15 13:44:48 -05:00
terrafrost
50e8230350
Exceptions: CS adjustment
2015-07-15 13:23:22 -05:00
terrafrost
3cb0248f99
Crypt/Base: add initial exception support
...
To accomodate this decrypt() can no longer return false. If padding is enabled and the padding length is invalid (the only condition under which false was returned) an InvalidInputException will be thrown.
Also, previously, when encrypting, if the padding was disabled and the plaintext wasn't a multiple of the block size a E_USER_NOTICE would be issued via user_error() and then padding would be enabled. Now it's not enabled - an exception is thrown suggesting that you might want to enable padding and that's that.
2015-07-15 12:50:57 -05:00
terrafrost
4dc79b96ed
SSH2: limit the size of data that expect() looks at
2015-07-14 19:05:52 -05:00
Andreas Fischer
f2773847a2
Merge branch '1.0' into 2.0
...
* 1.0:
Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256}
Conflicts:
phpseclib/Net/SSH2.php
2015-07-08 15:45:53 +02:00
Andreas Fischer
cdda621903
Merge pull request #714 from bantu/diffie-hellman-group-exchange-sha256
...
Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256}
* bantu/diffie-hellman-group-exchange-sha256:
Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256}
2015-07-08 15:43:46 +02:00
Andreas Fischer
abeda5237f
Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256}
2015-07-08 00:00:40 +02:00
Andreas Fischer
f782005a3f
Merge branch '1.0' into 2.0
...
* 1.0:
SFTP: don't update stat cache when it's been disabled
2015-07-06 23:48:28 +02:00
Andreas Fischer
7f1dfba50d
Merge pull request #730 from terrafrost/disable-stat-cache-1.0
...
SFTP: don't update stat cache when it's been disabled
* terrafrost/disable-stat-cache-1.0:
SFTP: don't update stat cache when it's been disabled
2015-07-06 23:48:28 +02:00
Andreas Fischer
83cac3385b
Merge branch '1.0' into 2.0
...
* 1.0:
SFTP: update how recursive delete's update stat cache
Tests/SFTP: add unit test
2015-07-06 23:38:10 +02:00
Andreas Fischer
643103449c
Merge pull request #731 from terrafrost/sftp-recur-delete-stat-cache-1.0
...
SFTP: delete stat cache for recursive deletes / 1.0 branch
* terrafrost/sftp-recur-delete-stat-cache-1.0:
SFTP: update how recursive delete's update stat cache
Tests/SFTP: add unit test
2015-07-06 23:37:55 +02:00
terrafrost
c460e511a0
SFTP: update how recursive delete's update stat cache
2015-07-04 13:09:26 -05:00
terrafrost
109ae38e48
SFTP: don't update stat cache when it's been disabled
2015-07-04 12:19:35 -05:00
Andreas Fischer
727677d4e1
Merge pull request #713 from bantu/SFTPStreamTest
...
[1.0] Various fixes to fopen mode handling in SFTP Stream
* bantu/SFTPStreamTest:
Explicitly set size to 0 when creating or truncating.
mode[0] of 'c' is not supposed to truncate.
Need to create the file when it does not exist and mode[0] is not 'r'.
Add SFTPStreamTest::testFopenFcloseCreatesFile()
2015-07-04 14:28:06 +02:00
Andreas Fischer
ba46db1758
Merge pull request #713 from bantu/SFTPStreamTest
...
Various fixes to fopen mode handling in SFTP Stream
* bantu/SFTPStreamTest:
Explicitly set size to 0 when creating or truncating.
mode[0] of 'c' is not supposed to truncate.
Need to create the file when it does not exist and mode[0] is not 'r'.
Add SFTPStreamTest::testFopenFcloseCreatesFile()
Conflicts:
tests/Functional/Net/SFTPLargeFileTest.php
2015-07-04 01:18:19 +02:00
Andreas Fischer
483c253879
Merge branch '1.0' into 2.0
...
* 1.0:
X509: set one more parameter to null
X509: set another parameters field to null
2015-06-30 12:27:06 +02:00
terrafrost
77c757d095
X509: set one more parameter to null
2015-06-29 22:10:18 -05:00
terrafrost
6c2798be90
X509: set another parameters field to null
2015-06-29 21:53:27 -05:00
terrafrost
815f443ed1
Merge branch 'x509-rsa-null-1.0' into x509-rsa-null-2.0-2
...
Conflicts:
tests/Unit/File/X509/X509Test.php
2015-06-28 16:10:40 -05:00
terrafrost
46a3c0fbbb
X509: set parameter field to null for RSA keys
2015-06-28 11:32:42 -05:00
Andreas Fischer
e1dd7e9d69
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/SFTP: $lstat->$stat
Tests/SFTP: just check to see that stat / lstat return an array
SFTP: update conditions under which cache for lstat / . is used
Tests/SFTP: add test for stat's on .
2015-06-27 21:59:45 +02:00
Andreas Fischer
1ad66ad1ea
Merge pull request #719 from terrafrost/lstat-fix-1.0
...
SFTP: update conditions under which cache for lstat / . is used for 1.0 branch
* terrafrost/lstat-fix-1.0:
Tests/SFTP: $lstat->$stat
Tests/SFTP: just check to see that stat / lstat return an array
SFTP: update conditions under which cache for lstat / . is used
Tests/SFTP: add test for stat's on .
2015-06-27 21:59:45 +02:00
Andreas Fischer
89cf423c58
Merge branch '1.0' into 2.0
...
* 1.0:
SSH2: fix for window sizes > 2,147,483,648
2015-06-27 21:58:45 +02:00
terrafrost
d1d415618a
SFTP: update conditions under which cache for lstat / . is used
2015-06-26 23:34:14 -05:00
Andreas Fischer
d71da6b02b
Explicitly set size to 0 when creating or truncating.
2015-06-25 14:26:35 +02:00
Andreas Fischer
9e07fb704b
mode[0] of 'c' is not supposed to truncate.
2015-06-25 14:24:58 +02:00
Andreas Fischer
f0957021a1
Need to create the file when it does not exist and mode[0] is not 'r'.
2015-06-25 14:24:18 +02:00
terrafrost
c0555581e7
SSH2: fix for window sizes > 2,147,483,648
2015-06-24 23:45:14 -05:00
terrafrost
26059aa444
Merge branch '2.0' of git://github.com/phpseclib/phpseclib into stat-cache-fix-2.0
2015-06-20 21:15:55 -05:00
terrafrost
4d82df3fc7
Merge branch 'stat-cache-fix-1.0' into stat-cache-fix-2.0
...
Conflicts:
tests/Functional/Net/SFTPUserStoryTest.php
2015-06-20 19:59:48 -05:00
terrafrost
6bc3513914
SFTP: stat cache updates
2015-06-20 19:33:19 -05:00
Andreas Fischer
ecdd97f8a8
Merge pull request #702 from terrafrost/asn1-fix-2.0
...
ASN1 parsing fix for issue mainly effecting CSR's for 2.0 branch
* terrafrost/asn1-fix-2.0:
Tests/X509: PHP5 adjustments
ASN1: handle malformed input better
Tests/X509/CSR: add unit test for ASN1 changes
ASN1: constructed context-specific tags can have x sub elements
2015-06-16 16:30:46 +02:00
Andreas Fischer
a79b4ac6ad
Merge pull request #699 from terrafrost/asn1-fix-1.0
...
ASN1 parsing fix for issue mainly effecting CSR's for 1.0 branch
* terrafrost/asn1-fix-1.0:
ASN1: handle malformed input better
Tests/X509/CSR: add unit test for ASN1 changes
ASN1: constructed context-specific tags can have x sub elements
2015-06-16 16:30:35 +02:00
terrafrost
4e5ca26342
RC4: re-add the OpenSSL changes for RC4
...
looks like they got skipped over when the merge conflict was resolved
2015-06-10 07:10:03 -05:00
Andreas Fischer
902e41a2a4
Merge pull request #693 from terrafrost/rsa-none-2.0
...
add "none" encryption mode for 2.0 branch
* terrafrost/rsa-none-2.0:
Tests/RSA: pack expected result
Tests/RSA: pack expected result
Tests/RSA: re-added accidentally removed $rsa initialization
Tests/RSA: use correct constant
Tests/RSA: fix error
Tests/RSA: hard-coded key and result
RSA: add "none" encryption mode
2015-06-09 17:19:16 +02:00
Andreas Fischer
956607d4e0
Merge pull request #692 from terrafrost/rsa-none-1.0
...
add "none" encryption mode for 1.0 branch
* terrafrost/rsa-none-1.0:
Tests/RSA: pack expected result
Tests/RSA: re-added accidentally removed $rsa initialization
Tests/RSA: fix error
Tests/RSA: hard-coded key and result
RSA: add "none" encryption mode
2015-06-09 17:18:47 +02:00
terrafrost
22b10c6a3a
Merge branch 'asn1-fix-1.0' into asn1-fix-2.0
2015-06-07 10:24:11 -05:00
terrafrost
11000a93b9
ASN1: handle malformed input better
2015-06-07 09:59:13 -05:00
terrafrost
d3a5398fe4
ASN1: constructed context-specific tags can have x sub elements
...
previously it only worked for when there was one sub element.
2015-06-03 23:48:43 -05:00
terrafrost
30260f3321
Merge branch 'rsa-none-1.0' into rsa-none-2.0
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-05-25 22:36:10 -05:00
terrafrost
1d924cfc7b
RSA: add "none" encryption mode
2015-05-25 22:30:38 -05:00
terrafrost
649d469c1c
ANSI: use default namespace for stdClass
2015-05-23 21:01:45 -05:00
terrafrost
6c345acc1d
ANSI: PHP5 updates
2015-05-23 18:23:40 -05:00
terrafrost
e4fee53c93
Merge branch 'ansi-updates-1.0' into ansi-updates-2.0
2015-05-23 18:18:22 -05:00
terrafrost
48191bdeec
ANSI: fix typo
2015-05-23 17:39:17 -05:00
terrafrost
2bb70a1c22
ANSI: rendering improvements
2015-05-23 16:51:57 -05:00
terrafrost
cc0420b36b
ANSI: improve vt100 terminal emulation
...
store each coordinate's attributes independently and add support
for a few more escape codes
2015-05-23 11:55:03 -05:00
terrafrost
4c4c8554a6
Merge branch '1.0' into 2.0
...
Conflicts:
README.md
2015-05-07 08:19:02 -05:00
terrafrost
ab98a7c30c
Merge branch 'booleans-1.0' into booleans-2.0
...
Conflicts:
README.md
2015-05-07 00:29:33 -05:00
terrafrost
2fee2d4f98
backport e3betht's PR to 1.0
2015-05-07 00:26:39 -05:00
terrafrost
895caa706d
Merge remote-tracking branch 'lukas/fingerprint' into rsa-fingerprint-2.0
...
Conflicts:
phpseclib/Crypt/RSA.php
tests/Unit/Crypt/RSA/LoadKeyTest.php
2015-05-06 23:06:07 -05:00
terrafrost
c1d47856c8
Merge branch 'rsa-fingerprint-1.0' into rsa-fingerprint-2.0
2015-05-06 23:02:12 -05:00
terrafrost
f19bf7a07d
RSA: backport getPublicKeyFingerprint from Lukas-W's PR
2015-05-06 22:55:12 -05:00
Lukas W
10d88c9c17
RSA fingerprint: Fix missing md5
2015-05-06 08:27:15 +02:00
Andreas Fischer
8e2f694129
Merge branch '1.0' into 2.0
...
* 1.0:
SSH2: string shift by 4 instead of by 1
SSH2: fix E_NOTICE involving global requests
2015-05-05 16:14:12 +02:00
Andreas Fischer
5bd7a73a71
Merge pull request #674 from terrafrost/ssh2-global-request
...
fix E_NOTICE with SSH2 global requests
* terrafrost/ssh2-global-request:
SSH2: string shift by 4 instead of by 1
SSH2: fix E_NOTICE involving global requests
2015-05-05 16:14:12 +02:00
Lukas W
c46890b00c
RSA fingerprint feature fix
...
Proper Hash usage, PHP 4 compatibility
2015-05-05 08:51:17 +02:00
terrafrost
684d6eed0e
SSH2: string shift by 4 instead of by 1
2015-05-04 08:22:27 -05:00
Lukas W
a67f4df164
RSA: Add support for calculating a public key's fingerprint
2015-05-04 09:21:37 +02:00
Andreas Fischer
661f3ce3b9
Merge branch '1.0' into 2.0
...
* 1.0:
Replace ; with : in case statement.
Conflicts:
phpseclib/Net/SFTP.php
phpseclib/Net/SSH2.php
2015-05-03 14:13:56 +02:00
Andreas Fischer
5d2590feb0
Replace ; with : in case statement.
2015-05-03 13:18:23 +02:00
Andreas Fischer
daaa931dc2
Merge branch '1.0' into 2.0
...
* 1.0:
callbacks - two PRs conflict sorted out. First one: e9b698fd65
, fba6894474
, 1cd286642e
Second one: 16430d4d2e
, 0cc6125f87
documentation fix
Conflicts:
phpseclib/Net/SFTP.php
2015-05-03 01:10:53 +02:00
andrey012
e7719f765c
callbacks - two PRs conflict sorted out.
...
First one: e9b698fd65
, fba6894474
, 1cd286642e
Second one: 16430d4d2e
, 0cc6125f87
2015-05-02 15:27:57 +03:00
andrey012
f4a93c790f
Merge branch '1.0' into sftp-put-callback-for-1.0
2015-05-02 15:24:31 +03:00
andrey012
0cc6125f87
documentation fix
2015-05-02 14:28:19 +03:00
terrafrost
b59d821bbe
SSH2: fix E_NOTICE involving global requests
2015-04-30 21:34:07 -05:00
terrafrost
36ef1c4084
Merge remote-tracking branch 'audrey/sftp-put-callback' into 2.0
2015-04-16 07:45:39 -05:00
terrafrost
1d772c3a6f
Merge remote-tracking branch 'audrey/sftp-put-callback-for-1.0' into 1.0
2015-04-16 07:45:24 -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
terrafrost
9f626c67b6
Merge remote-tracking branch 'graham/1.0-phpdoc' into 1.0-phpdoc
2015-04-16 00:31:54 -05:00
terrafrost
ca0b56f05c
Merge branch '1.0' into 2.0
...
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Net/SFTP.php
2015-04-15 23:56:09 -05:00
terrafrost
b47813cf47
Merge remote-tracking branch 'DavidAnderson84/patch-4' into 1.0
2015-04-15 23:52:00 -05:00
andrey012
26086789ef
replace throw with user_error()
2015-04-15 03:35:08 +03:00
andrey012
16430d4d2e
support for callback function for SFTP::put function - in order to pipe data directly to remote server without putting it into file or keeping in memory. This can be useful particularly for dumping big databases directly to remote server.
2015-04-15 03:29:01 +03:00
Andrey Grinenko
b5e80bc176
cosmetics
2015-04-11 11:34:41 +03:00
terrafrost
047a75a636
Merge branch '2.0' of https://github.com/phpseclib/phpseclib into openssl-support-2.0
2015-04-10 23:08:08 -05:00
terrafrost
0b1d3aa7e9
SSH2: NET_SSH2_MASK_* -> self::MASK_*
2015-04-10 17:48:58 -05:00
Andrey Grinenko
e58427221d
support for callback function for SFTP::put function - in order to pipe data directly to remote server without putting it into file or keeping in memory. This can be useful particularly for dumping big databases directly to remote server.
2015-04-09 02:59:00 +03:00
terrafrost
0835389b5a
CS adjustments
2015-04-02 22:39:47 -05:00
terrafrost
f5f714b197
Merge branch 'openssl-support' of https://github.com/terrafrost/phpseclib into openssl-support
2015-04-02 07:05:10 -05:00
terrafrost
adad5fa157
Crypt/*: update some docblock comments
2015-04-02 07:04:02 -05:00
terrafrost
c42d8382dd
Crypt/Base: CRYPT_MODE -> self::MODE
2015-04-02 07:01:37 -05:00
terrafrost
c274370ed9
another typo
2015-04-02 06:50:55 -05:00
terrafrost
a530152628
Crypt/Base: fix syntax errors
2015-04-02 06:23:54 -05:00
terrafrost
87e0f05ada
Merge branch 'openssl-support' of https://github.com/terrafrost/phpseclib into openssl-support
2015-04-02 05:58:58 -05:00
terrafrost
d75f703c0a
rm PHP v4 compatability claim
2015-04-02 05:57:52 -05:00
terrafrost
56d6d5dcb0
Crypt/Base: fix syntax error
2015-04-02 05:54:00 -05:00
terrafrost
e510dc878b
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into openssl-support
...
Conflicts:
phpseclib/Net/SSH2.php
2015-04-02 05:40:14 -05:00
terrafrost
023fef8d8b
Merge branch '2.0' of https://github.com/phpseclib/phpseclib into openssl-support-2.0
...
Conflicts:
phpseclib/Net/SSH2.php
2015-04-02 05:37:04 -05:00
terrafrost
ebcb3130b7
Merge branch 'openssl-support' into 2.0
...
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
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPLargeFileTest.php
tests/Unit/Crypt/AES/InternalTest.php
tests/Unit/Crypt/AES/McryptTest.php
tests/Unit/Crypt/AES/TestCase.php
2015-04-02 05:32:31 -05:00
terrafrost
e9fe245132
Crypt/Base: update some comments
2015-03-30 23:43:28 -05:00
terrafrost
1a51226d84
Crypt/Base; prioritize OpenSSL over mcrypt
2015-03-30 23:33:52 -05:00
Andreas Fischer
8101772ab4
Merge branch '1.0' into 2.0
...
* 1.0:
SSH2: rm unused $connectionTimeout variable
SSH2: rm redundant code and make php4 compatable
SSH2: timeout improvements
Conflicts:
phpseclib/Net/SSH2.php
2015-03-30 12:46:54 +02:00
Andreas Fischer
c0370ee91d
Merge pull request #639 from terrafrost/banner-timeout
...
improve error handling with protocol version exchange
* terrafrost/banner-timeout:
SSH2: rm unused $connectionTimeout variable
SSH2: rm redundant code and make php4 compatable
SSH2: timeout improvements
2015-03-30 12:37:46 +02:00
Andreas Fischer
6dc32808f1
Merge pull request #644 from terrafrost/agentforwarding-1.0
...
Agent Forwarding for 1.0 branch
* terrafrost/agentforwarding-1.0:
removed unwarrented user_error
preference isset over array_key_exists, return false on failure, break after return channel opened
moved agent forwarding channel handling to filter method and reusing existing open channels to request forwarding
removed stopSSHForwarding
determining what failure to expect
addresses low hanging fruit comments from terrafrost and bantu
removed superfluous default case
SSH agent forwarding implementation
2015-03-30 12:22:57 +02:00
terrafrost
6bd4e6018e
Crypt/Base: rm redundant null padding
2015-03-29 15:26:15 -05:00
Graham Campbell
e50cbacd4e
Fixed some phpdocs
2015-03-29 17:07:17 +01:00
terrafrost
33645f5297
SSH2: missed a file in the merge
2015-03-29 10:58:05 -05:00
terrafrost
a8e702b34f
Merge branch 'agentforwarding-1.0' into agentforwarding-2.0
...
Conflicts:
phpseclib/Net/SSH2.php
phpseclib/System/SSH/Agent.php
2015-03-29 10:32:30 -05:00
terrafrost
bb01002233
Merge remote-tracking branch 'agentforwarding/feature/ssh_agent_forwarding' into agentforwarding-1.0
2015-03-28 21:03:17 -05:00
terrafrost
1294b08675
SSH2: rm unused $connectionTimeout variable
2015-03-27 22:32:38 -05:00
montdidier
3ff4212b92
removed unwarrented user_error
2015-03-24 13:40:42 +08:00
montdidier
9723acc885
preference isset over array_key_exists, return false on failure, break after return channel opened
2015-03-24 13:38:56 +08:00
terrafrost
4ba8c24c13
DES: fix fatal error that could occur under special circumstances
2015-03-21 11:01:43 -05:00
terrafrost
dfd57dfb89
SSH2: rm redundant code and make php4 compatable
2015-03-19 22:39:43 -05:00
terrafrost
23c65c3839
SSH2: timeout improvements
...
make it so that the timeout in the constructor behaves in the same
way that timeout's set via setTimeout() do. eg. isTimeout() tells
you if a timeout was thrown etc.
2015-03-19 07:53:19 -05:00
terrafrost
8f81fc8f28
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into openssl-support
2015-03-15 02:45:32 -05:00
terrafrost
9a400c4094
Crypt/Base: engine wasn't being set correctly
2015-03-15 02:44:13 -05:00
Andreas Fischer
f57e01df65
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/X509: add unit test
X509: make it so you can use File_ASN1_Element for custom X.509 extensions
2015-03-10 13:46:15 +01:00
terrafrost
7ac2470c98
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into x509-custom-extensions
2015-03-09 01:38:33 -05:00
Andreas Fischer
63ed03b119
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/X509: swap expected and actual value
Tests/X509: fix unit test
Tests/X509: add unit test for unsupported extension encoding
X509: always base64-encode extensions for which _getMapping returns a bool
2015-03-05 15:37:46 +01:00
terrafrost
e686c095b6
X509: always base64-encode extensions for which _getMapping returns a bool
2015-03-01 12:05:49 -06:00
terrafrost
7e2dd90140
X509: make it so you can use File_ASN1_Element for custom X.509 extensions
2015-03-01 11:57:36 -06:00
terrafrost
3f3e0cac98
setengine changes per bantu
2015-02-24 00:05:00 -06: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
montdidier
25b328c440
removed stopSSHForwarding
2015-02-05 13:19:57 +08: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
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
009d883d4c
Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support
2015-01-14 20:13:08 -06: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
Andreas Fischer
04dad3ff8c
Merge branch 'master' into php5
...
* master:
Compare numeric part of OpenSSL version
2015-01-09 13:09:21 +01:00
Ha Phan
b0129e9125
Compare numeric part of OpenSSL version
2015-01-08 20:55:14 +07:00
Clint Nelissen
71c2d43956
Marked Base as abstract
2015-01-05 08:42:30 -08:00
Andreas Fischer
3c99773184
Merge pull request #588 from terrafrost/disconnect-fix
...
SSH2: update conditions under which _disconnect's code is executed
* terrafrost/disconnect-fix:
SSH2: update conditions under which _disconnect's code is executed
2015-01-04 11:57:52 +01:00
Andreas Fischer
1c923576c6
NET_SSH2_ -> self::
2015-01-04 11:38:03 +01:00
Andreas Fischer
ec21aa23f1
Merge pull request #588 from terrafrost/disconnect-fix
...
SSH2: update conditions under which _disconnect's code is executed
* terrafrost/disconnect-fix:
SSH2: update conditions under which _disconnect's code is executed
2015-01-04 11:36:14 +01:00
Andreas Fischer
8fae19a024
Merge pull request #581 from cnelissen/ReplaceGetClassFix
...
Replaced get_class() calls with instanceof operators
* cnelissen/ReplaceGetClassFix:
Revert changes for abstract methods in Base class
Replaced get_class() calls with instanceof operators
2015-01-03 17:22:39 +01:00
terrafrost
b24e7c3fc9
Crypt/Base: don't modify the IV when the mode isn't continuous for CFB
2015-01-01 00:27:30 -06:00
terrafrost
7b58268d58
Crypt/Base: fix bug with openssl non-continuous CTR mode
2014-12-31 23:38:55 -06:00
terrafrost
b831724e1a
Crypt/Base: don't always treat CTR as being continuous w/ OpenSSL
2014-12-31 22:24:56 -06:00
terrafrost
c6c1e8dcb0
Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support
2014-12-31 14:38:22 -06:00
terrafrost
be168e262f
Crypt/Base: stream ciphers cannot be run in continuous mode with OpenSSL
2014-12-31 14:10:53 -06:00
terrafrost
e3487c8adb
RC4: use the parent encrypt / decrypt methods if openssl is being used
2014-12-30 23:33:12 -06:00
terrafrost
5a91539148
SSH2: rm unsupported algorithms if OpenSSL is being used
2014-12-29 22:10:26 -06:00
montdidier
aca4ba3286
SSH agent forwarding implementation
2014-12-30 10:44:31 +08:00
Clint Nelissen
d4f04bcab1
Revert changes for abstract methods in Base class
2014-12-29 08:54:45 -08:00
terrafrost
472e006b6c
SSH2: update conditions under which _disconnect's code is executed
2014-12-29 08:37:44 -06:00
Andreas Fischer
f2134aa4b2
Merge branch 'master' into php5
...
* master:
"@access static" isn't a thing
2014-12-27 20:25:04 +01:00
Graham Campbell
bd0537fec5
"@access static" isn't a thing
2014-12-27 15:38:14 +00:00
David Anderson
1cd286642e
Change dochint as requested
2014-12-27 14:10:44 +00:00
David Anderson
fba6894474
Add docblock
2014-12-27 14:02:29 +00:00
David Anderson
e9b698fd65
Add callback to SFTP.php
...
Currently, Net_SCP::put() has a callback parameter, allowing the consumer to monitor/log/report progress (or whatever they please).
This patch adds the same feature, working in the same way, to Net_SFTP::put()
2014-12-27 13:55:00 +00:00
Andreas Fischer
6205531907
Merge branch 'master' into php5
...
* master:
Fix undefined $raw error
2014-12-26 10:48:16 +01:00
Clint Nelissen
01d7c96a11
Fix undefined $raw error
2014-12-26 10:37:46 +01:00
Clint Nelissen
f3565346fa
Replaced get_class() calls with instanceof operators
2014-12-24 13:07:14 -08:00
terrafrost
f91c4ccf60
DES: apparently TripleDES extends DES
...
this was not always the case:
See c4752cbeba
2014-12-20 11:14:29 -06:00
Clint Nelissen
fe742e18d7
Namespaced Crypt Package
2014-12-16 16:16:54 -08:00
Clint Nelissen
dfb8d52806
Temporary constant fix
2014-12-15 14:29:34 -08:00
Clint Nelissen
628949fb73
Namespaced classes
2014-12-15 14:29:20 -08:00
Clint Nelissen
fddf20f89c
Namespaced classes
2014-12-15 09:25:46 -08:00
terrafrost
5d0cb1cee9
Crypt/Base: more fixes to pre 5.4.0 padding adjustments
2014-12-14 12:00:34 -06:00
terrafrost
d9adb66609
Crypt/Base: fix typo
2014-12-14 11:03:12 -06:00
terrafrost
4cc23b7006
Crypt/Base: $block_size -> $this->block_size
2014-12-14 10:48:18 -06:00
terrafrost
31af2b3ed3
Crypt/Base: fix decryption for ECB / CBC on PHP < 5.4.0
2014-12-14 10:40:40 -06:00
terrafrost
51c0deba45
Crypt/Base: update one more comment
2014-12-13 14:22:12 -06:00
terrafrost
7d31f924a8
Crypt/Base: clean up comments
2014-12-13 14:20:25 -06:00
terrafrost
c5f74eb3a3
Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support
2014-12-13 14:15:34 -06:00
terrafrost
8d8c2693c5
Crypt: rm @version stuff
2014-12-13 14:13:24 -06:00
terrafrost
f5f9c3d409
Crypt: replace CRYPT_MODE_INTERNAL/MCRYPT/OPENSSL with CRYPT_ENGINE_*
2014-12-13 13:58:41 -06:00
Andreas Fischer
3f912eed59
Merge pull request #554 from cnelissen/NamespaceFilePackage
...
Namespace file package
* cnelissen/NamespaceFilePackage:
Namespaced classes
2014-12-12 17:55:44 +01:00
Clint Nelissen
cea5e317b6
Namespaced classes
2014-12-09 16:53:05 -08:00
Andreas Fischer
36999bd25a
Change copyright years from roman numeral to decimal numbers for php5.
2014-12-10 00:07:46 +01:00
Andreas Fischer
c4b103468c
Merge pull request #549 from bantu/fix-547
...
Change copyright years from roman numeral to decimal numbers.
* bantu/fix-547:
Change copyright years from roman numeral to decimal numbers.
Conflicts:
phpseclib/System/SSH_Agent.php
2014-12-10 00:06:08 +01:00
Andreas Fischer
0efae5a91e
Change copyright years from roman numeral to decimal numbers.
2014-12-10 00:04:08 +01:00
Clint Nelissen
0305a4827c
Moved globally defined constants to class constants
2014-12-09 10:46:30 -08:00
Clint Nelissen
ecb9c32f02
Merge branch 'php5' of https://github.com/phpseclib/phpseclib into NetPackageConstantsFix
...
Conflicts:
phpseclib/Net/SSH2.php
2014-12-08 10:40:57 -08:00
Andreas Fischer
2f27620409
Add #@+ block for properties used by internal implementation.
2014-12-08 16:02:39 +01:00
Andreas Fischer
8ecf956499
Move in-code comments to property doc blocks.
2014-12-07 23:00:59 +01:00
Clint Nelissen
f5d6b7423d
Refactor defined MATH_BIGINTEGER_ constants into class constants.
2014-12-07 22:33:39 +01:00
terrafrost
9a55ab1892
Blowfish: syntax error
2014-12-07 14:43:30 -06:00
Andreas Fischer
7b7e7d8de5
Add public keyword to Crypt\Random::string().
2014-12-07 15:14:34 +01:00
terrafrost
69614034ec
Crypt_Base: fix to the IV handling of the last commit
2014-12-07 07:35:30 -06:00
terrafrost
b35cedcb15
Crypt_Base: deal with IV's more appropriately
2014-12-06 23:36:26 -06:00
Andreas Fischer
e52a3aff5a
Merge branch 'master' into php5
...
* master:
SSH2: simplify _send_channel_packet
2014-12-06 12:25:16 +01:00
terrafrost
96eb1f3797
SSH2: simplify _send_channel_packet
...
the last _send_channel_packet was unnecessarily complex. this lead
to a number of problems. for example,
the window size was checked for adjustments in two places. in the
second place it receives a window adjustment packet and just assumes
that the window adjustment packet was big enough for the rest of the
data.
(thanks, pixall!)
2014-12-05 22:01:39 -06:00
Andreas Fischer
da2ea27e7a
Merge pull request #523 from cnelissen/FilePackageConstantsFix
...
File package constants fix
* cnelissen/FilePackageConstantsFix:
Docblock fix
Moved global constants into class constants and updated all references
2014-12-05 01:00:01 +01:00
Clint Nelissen
99b9cc477d
Moved global constants to class constants
2014-12-04 13:45:13 -08:00
Andreas Fischer
01650cf7d7
Merge pull request #524 from cnelissen/SystemPackageConstantsFix
...
System package constants fix
* cnelissen/SystemPackageConstantsFix:
Added SSH_AGENT_FAILURE constant back in
Missed a couple SYSTEM_ prefixes
Moved global constants to class constants
2014-12-04 20:05:55 +01:00
Andreas Fischer
a3f52dcf61
Merge branch 'master' into php5
...
* master:
Quote shell argument with escapeshellarg()
2014-12-04 20:00:45 +01:00
Andreas Fischer
262da528a0
Merge pull request #527 from DavidAnderson684/patch-2
...
Quote shell argument with escapeshellarg()
* DavidAnderson684/patch-2:
Quote shell argument with escapeshellarg()
2014-12-04 20:00:41 +01:00
Andreas Fischer
243ad0c54a
Merge branch 'master' into php5
...
* master:
SCP: Add missing space after case statement.
2014-12-04 19:56:34 +01:00
Clint Nelissen
f085f91d16
Added SSH_AGENT_FAILURE constant back in
2014-12-04 10:38:58 -08:00
Andreas Fischer
f40bb9190f
SCP: Add missing space after case statement.
2014-12-04 18:42:47 +01:00
David Anderson
14dc468b70
Quote shell argument with escapeshellarg()
...
Currently, the call to "scp -t" or "scp -f" just uses naive quoting - i.e. a couple of quote marks are thrown in.
But, this can easily be escaped from - if the filename has a quote mark of its own in it, for example.
e.g. if the filename is as follows, then bad things will happen:
";rm -rf /
Instead, escapeshellarg should be used, to make sure it gets escaped properly.
2014-12-04 16:50:23 +00:00
Clint Nelissen
e8c93d8cfe
Docblock fix
2014-12-04 08:30:07 -08:00
Clint Nelissen
19b4d0ec0c
Missed a couple SYSTEM_ prefixes
2014-12-04 08:28:05 -08:00
Clint Nelissen
f7fb93276a
Moved global constants to class constants
2014-12-03 18:44:30 -08:00
Clint Nelissen
a9925941b0
Moved global constants into class constants and updated all references
2014-12-03 18:20:10 -08:00
Andreas Fischer
b771ca36cf
Merge pull request #519 from bantu/remove-license-text
...
Remove LICENSE text from source code files.
* bantu/remove-license-text:
Remove LICENSE text from source code files.
2014-12-03 23:13:00 +01:00
Andreas Fischer
632c47e55f
Merge branch 'master' into php5
...
* master:
Avoid calling fclose(false)
2014-12-03 23:08:56 +01:00
David Anderson
647a1e9a5e
Avoid calling fclose(false)
...
The previous code would always call fclose(false) if the file was not successfully opened - resulting in a PHP notice.
2014-12-03 19:29:46 +00:00
Andreas Fischer
638e62d60a
Remove LICENSE text from source code files.
2014-12-03 18:49:33 +01:00
Andreas Fischer
dbbc21cb64
Merge pull request #510 from cnelissen/FixFileAsn1Classes
...
Split File_ASN1 and File_ASN1_Element into separate files
* cnelissen/FixFileAsn1Classes:
Code sniffer php version fix
Removed duplicated docblock text
Codesniff fix
Split File_ASN1 and File_ASN1_Element into separate files
2014-12-03 18:38:23 +01:00
Andreas Fischer
cc4aac1f29
Merge pull request #509 from cnelissen/FixSSHAgentClasses
...
Split System_SSH_Agent and System_SSH_Agent_Identity into separate files
* cnelissen/FixSSHAgentClasses:
Code sniff php version fix
Removed duplicated docblock text
Split System_SSH_Agent and System_SSH_Agent_Identity into separate files
2014-12-03 18:38:17 +01:00
Clint Nelissen
ef3c96a46f
Code sniff php version fix
2014-12-03 08:59:01 -08:00
Clint Nelissen
9bb9f54773
Code sniffer php version fix
2014-12-03 08:57:41 -08:00
Clint Nelissen
d6029bdb6a
Removed includes for Random.php and fixed up user_error message
2014-12-02 09:34:15 -08:00
Clint Nelissen
f5ed86e385
Renamed Random::crypt_random_string to Random::string
2014-12-02 09:20:40 -08:00
Clint Nelissen
c70702afbb
Namespaced Crypt\Random
2014-12-02 08:41:30 -08:00
Clint Nelissen
45ed270556
Removed duplicated docblock text
2014-12-02 08:18:43 -08:00
Clint Nelissen
7fe4007053
Removed duplicated docblock text
2014-12-02 08:17:53 -08:00
Clint Nelissen
3129faf05d
Codesniff fix
2014-12-01 19:28:02 -08:00
Clint Nelissen
feca21da2b
Split File_ASN1 and File_ASN1_Element into separate files
2014-12-01 19:26:52 -08:00
Clint Nelissen
b32c05b64e
Split System_SSH_Agent and System_SSH_Agent_Identity into separate files
2014-12-01 19:18:58 -08:00
Clint Nelissen
bc3deb191f
Code sniff fix
2014-12-01 19:01:00 -08:00
Clint Nelissen
9c0c3faeb7
Initial commit
2014-12-01 18:54:44 -08:00
terrafrost
129dc320b0
Crypt_Base: fix the rest of the E_NOTICEs
2014-11-29 22:26:42 -06:00
terrafrost
6c09d6f565
Crypt_Base: fix E_NOTICEs
2014-11-29 16:18:17 -06:00
terrafrost
866b690248
Crypt: CS adjustments
2014-11-29 09:52:14 -06:00
terrafrost
8476ae6383
Crypt_Base: openssl_(en|de)crypt's parameters changed in PHP 5.4.0
2014-11-29 09:48:45 -06:00
terrafrost
8fc4f4b70c
Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support
2014-11-29 07:46:06 -06:00
terrafrost
f6e0c4b506
Crypt: add OpenSSL support
...
aside from the addition of OpenSSL support a few other changes have been included:
- setEngine(), as added by petrich, is depricated (not that it was ever in trunk to begin with)
it has been replaced with isValidEngine() and setPreferredEngine().
- replace _generate_xor() with increment_str()
_increment_str() had extra functionality that wasn't being used. ie. it could concatenate
multiple successive string increments to one another automatically. but not only was that
functionality not used - it also made the function less versatile. _increment_str() can be
used more easily for iterative brute forcing (for example)
- rename Crypt_Base::_stringShift to Crypt_Base::_string_shift (for consistency)
- more expansive unit test coverage
2014-11-29 07:39:21 -06:00
Andreas Fischer
43d2e9ef68
Merge branch 'master' into php5
...
* master:
SSH2: clarify exec() docblock comment
2014-11-20 10:58:33 +01:00
terrafrost
b1e6643032
SSH2: clarify exec() docblock comment
2014-11-19 22:38:19 -06:00
Andreas Fischer
10e5653324
Merge branch 'master' into php5
...
* master:
SSH2: fix issues with RSA key verification
Conflicts:
phpseclib/Net/SSH2.php
2014-11-07 13:13:38 +01:00
terrafrost
3eac2582d6
SSH2: fix issues with RSA key verification
...
Sometimes SSH servers will null pad their RSA keys. this null padding
broke Net/SSH2.php's RSA implementation (Crypt/RSA.php's implementation
works just fine). Also, the -3 was counting the initial "\0" of $h
twice so adjust it to -2.
2014-11-06 11:58:03 -06:00
Andreas Fischer
8af52e2954
Merge branch 'master' into php5
...
* master:
SFTP: Use hexdec() and bin2hex() for filesize calculation.
2014-10-19 21:32:23 +02:00
Andreas Fischer
5c3058cc4b
SFTP: Use hexdec() and bin2hex() for filesize calculation.
2014-10-19 21:07:12 +02:00
Andreas Fischer
45ce4b24ef
Merge branch 'master' into php5
...
* master:
SFTP: Replace incorrect comment about filesize. There is no 4 GiB limit.
Conflicts:
phpseclib/Net/SFTP.php
2014-10-19 20:54:50 +02:00
Andreas Fischer
1b57990e94
Merge pull request #492 from bantu/sftp-large-file-comment
...
SFTP: Replace incorrect comment about filesize. There is no 4 GiB limit.
* bantu/sftp-large-file-comment:
SFTP: Replace incorrect comment about filesize. There is no 4 GiB limit.
2014-10-19 20:53:09 +02:00
Andreas Fischer
0e38dc4951
Merge branch 'master' into php5
...
* master:
Restore compatibility with PHP 5.6.1 by using explicit array indexes.
2014-10-19 20:46:15 +02:00
Andreas Fischer
ad03d84461
Restore compatibility with PHP 5.6.1 by using explicit array indexes.
...
This seems to be caused by the resolution of PHP Ticket 67985.
2014-10-19 20:24:13 +02:00
Andreas Fischer
5b932495cc
SFTP: Replace incorrect comment about filesize. There is no 4 GiB limit.
2014-10-15 17:27:48 +02:00
terrafrost
c8b55b8929
Rijndael: calling $rijndael->setEngine() didn't have any effect
...
(CRYPT_RIJNDAEL_MODE constant was always over-riding it)
2014-10-12 00:52:52 -05:00
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
e682e20df4
Merge branch 'master' into php5
...
* master:
Correct constant: NET_SFTP_BLOCK_DEVICE -> NET_SFTP_TYPE_BLOCK_DEVICE
2014-10-09 23:51:33 +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
645c16d0f5
Merge branch 'master' into php5
...
* master:
Fix Net_SFTP::filetype() block device recognition.
2014-10-09 23:19:23 +02:00
Vladimir Volodko
6715c41e1f
Fix Net_SFTP::filetype() block device recognition.
2014-10-09 12:46:58 +07:00
Andreas Fischer
92c3127448
Merge branch 'master' into php5
...
* master:
SSH2: removed redundant rtrim
2014-09-28 12:43:54 +02:00
Cezary Kluczyński
0692a1ea7d
SSH2: removed redundant rtrim
2014-09-28 12:39:54 +02:00
Andreas Fischer
da02246cc4
Merge branch 'master' into php5
...
* master:
BigInteger: accomodate GMP change in PHP 5.6
2014-09-27 22:57:59 +02:00
terrafrost
a43dd38365
BigInteger: accomodate GMP change in PHP 5.6
2014-09-27 12:52:54 -05:00
Andreas Fischer
eff5f64560
Merge branch 'master' into php5
...
* master:
ASN1: fix unit test
ASN1: add unit test for non-constructed context-specific change
ASN1: fix issue with non-constructed context-specific tags
README: update download link to 0.3.8
2014-09-24 16:50:12 +02: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
Andreas Fischer
5fa5a137dc
Merge branch 'master' into php5
...
* master:
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:42:07 +02: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
c489852332
RSA: update unit test
2014-09-09 00:28:38 -05:00
Andreas Fischer
e85321959e
SSH1: Math_BigInteger is supposed to be BigInteger.
2014-09-07 22:26:22 +02:00
Andreas Fischer
cf921a347a
Merge branch 'master' into php5
...
* master:
SSH2: rm unused constant
2014-09-07 12:43:27 +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
6cb0528d6e
Merge branch 'master' into php5
...
* master:
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
Conflicts:
phpseclib/File/ASN1.php
2014-09-04 22:22:16 +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
42e05a6714
Merge branch 'master' into php5
...
* master:
SSH2: don't count data length against window size
2014-09-03 20:44:53 +02: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
830667ce75
Merge branch 'master' into php5
...
* master:
Replaced "case true:" with "default:"
Error: "Constant CRYPT_RSA_MODE already defined"
2014-08-25 15:16:34 +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
a15079676c
Merge branch 'master' into php5
...
* master:
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:07 +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
terrafrost
e48ee12940
SFTP: make it so files can be downloaded into resources or upload
...
from resources
2014-08-16 12:49:55 -05:00
Andreas Fischer
6ba2b374e5
Merge branch 'master' into php5
...
* master:
AES: don't do mcrypt unit tests if mcrypt extension is not available
AES: a few final changes
AES: set CRYPT_RIJNDAEL_MODE as well in unit tests
AES: CS changes to unit tests
AES: more unit test fixes
AES: unit test updates
AES: more unit test fixes
AES: add new lines to end of unit tests
AES: CS adjustments to unit tests
AES: first attempt at unit tests for key padding
Rijndael, AES: adjustments to what key sizes are and aren't allowed
2014-08-15 16:27:36 +02:00
terrafrost
aa0e7347ef
AES: a few final changes
2014-08-14 23:09:17 -05:00
terrafrost
35fd2888ea
Rijndael, AES: adjustments to what key sizes are and aren't allowed
2014-08-13 09:56:49 -05:00