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
009d883d4c
Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support
2015-01-14 20:13:08 -06: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
terrafrost
be168e262f
Crypt/Base: stream ciphers cannot be run in continuous mode with OpenSSL
2014-12-31 14:10:53 -06:00
terrafrost
5a91539148
SSH2: rm unsupported algorithms if OpenSSL is being used
2014-12-29 22:10:26 -06:00
terrafrost
472e006b6c
SSH2: update conditions under which _disconnect's code is executed
2014-12-29 08:37:44 -06:00
Clint Nelissen
f3565346fa
Replaced get_class() calls with instanceof operators
2014-12-24 13:07:14 -08: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
c5f74eb3a3
Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support
2014-12-13 14:15:34 -06: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
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
Clint Nelissen
99b9cc477d
Moved global constants to class constants
2014-12-04 13:45:13 -08:00
Andreas Fischer
638e62d60a
Remove LICENSE text from source code files.
2014-12-03 18:49:33 +01: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
9c0c3faeb7
Initial commit
2014-12-01 18:54:44 -08:00
terrafrost
8fc4f4b70c
Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support
2014-11-29 07:46:06 -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
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
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
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
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
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
Andreas Fischer
9dc92a82a4
Merge branch 'master' into php5
...
* master:
SSH2: white space adjustment
SSH: update getServerPublicHostKey() to use new _connect() method
SSH2: fix if statement for conditional _connect() call
simplify calls to $this->_connect()
SSH2: make it so negotiated algorithms can be seen before login
2014-08-10 12:10:11 +02:00
Andreas Fischer
1de939fb4a
Merge pull request #427 from terrafrost/ssh2-show-methods-before-login
...
SSH2: make it so negotiated algorithms can be seen before login
* terrafrost/ssh2-show-methods-before-login:
SSH2: white space adjustment
SSH: update getServerPublicHostKey() to use new _connect() method
SSH2: fix if statement for conditional _connect() call
simplify calls to $this->_connect()
SSH2: make it so negotiated algorithms can be seen before login
2014-08-10 12:10:04 +02:00
terrafrost
04e263bb8c
SSH2: white space adjustment
2014-08-10 02:09:28 -05:00
terrafrost
085fb0ebb8
SSH: update getServerPublicHostKey() to use new _connect() method
2014-08-06 14:42:08 -05:00
terrafrost
5b019b22d9
SSH2: fix if statement for conditional _connect() call
2014-08-05 19:30:14 -05:00
terrafrost
dffef50838
simplify calls to $this->_connect()
2014-08-04 20:11:34 -05:00
Andreas Fischer
e4516fb453
Merge branch 'master' into php5
...
* master:
Add some test cases for SHA512.
Use toBits() as there is no bits property.
SSH2: Disallow the none MAC.
2014-07-26 17:20:09 +02:00
Andreas Fischer
2ccb301c4c
Merge pull request #425 from bantu/ssh-remove-none-mac
...
SSH2: Disallow the none MAC.
* bantu/ssh-remove-none-mac:
SSH2: Disallow the none MAC.
2014-07-26 13:14:39 +02:00
Andreas Fischer
fed60fe8ac
Merge branch 'master' into php5
...
* master:
ssh-hmac-sha2-256: Remove whitespace at end of line.
Added RFC6668
Add hmac-sha2-256 MAC support
2014-07-26 13:11:29 +02:00
Andreas Fischer
4be4533a6e
ssh-hmac-sha2-256: Remove whitespace at end of line.
2014-07-26 13:02:52 +02:00