terrafrost
0bbac3ebed
Merge branch '2.0'
2017-06-19 22:37:21 -05:00
terrafrost
3cbb9516ef
Merge branch '1.0' into 2.0
2017-06-19 22:35:22 -05:00
terrafrost
b6eb7b2009
Merge branch '2.0'
2017-06-19 22:34:28 -05:00
terrafrost
9814140055
Merge branch '1.0' into 2.0
2017-06-19 22:34:20 -05:00
Moritz Kornher
7606f81279
Add new mode READ_NEXT to only ready the next packet from the channel.
2017-06-19 22:33:08 -05:00
terrafrost
8ea3edf0d2
Merge branch '2.0'
2017-06-12 22:37:06 -05:00
terrafrost
9d0c924cbd
Merge branch '1.0' into 2.0
2017-06-12 22:36:58 -05:00
Sidney Souza
4d36e67bee
Fix Invalid HMAC for D-link DES-3028
...
When I tried connect to a dlink switch the Net_SSH2 does not choose
the correct algorithms for hmac causing an Invalid HMAC error. However,
after I commented the line 1280 everything work magnificently
2017-06-12 22:36:30 -05:00
terrafrost
a312a1d4f0
SSH2: update a few function calls to work with renamed methods
2017-05-28 09:44:38 -05:00
terrafrost
9cbf357ac5
Merge branch '2.0'
2017-03-01 22:27:31 -06:00
terrafrost
ecb92ad25c
Merge branch '1.0' into 2.0
2017-03-01 22:27:00 -06:00
terrafrost
8abc0ee60c
SSH2: include <pre> tags in getLog result when SAPI isn't CLI
2017-03-01 22:26:29 -06:00
terrafrost
9f4f288005
Merge branch '1.0' into 2.0
2017-03-01 22:24:59 -06:00
terrafrost
b8ceb96bd4
SSH2: include <pre> tags in getLog result when SAPI isn't CLI
2017-03-01 22:18:38 -06:00
terrafrost
a25c841108
Merge remote-tracking branch 'upstream/master' into php5-updates
2017-01-17 22:40:24 -06:00
terrafrost
b9b4f67a0f
Net: add public / private / protected
2017-01-17 10:23:28 -06:00
terrafrost
c8c61055d1
Merge branch '2.0'
2016-12-24 21:34:30 -06:00
terrafrost
95335f9560
SSH2: update PTY changes for 2.0 branch
2016-12-24 21:20:13 -06:00
terrafrost
6aa31b2cd1
Merge branch '1.0' into 2.0
2016-12-24 21:10:50 -06:00
terrafrost
785b477605
Merge branch 'pty-enhancement' into 1.0
2016-12-24 20:28:19 -06:00
terrafrost
2a7c99ef1b
...
2016-12-17 17:22:11 -06:00
terrafrost
a72a168400
Merge branch '1.0' into 2.0
2016-12-17 17:03:08 -06:00
vladimirghetau
d80794b1d9
exec authentication, code reuse
2016-12-17 16:37:04 -06:00
terrafrost
b26f14e5fe
SSH2: make it so disabling PTY closes exec() channel if it's open
2016-12-17 16:09:48 -06:00
terrafrost
2a1177b256
SymmetricCiphers: add public / private / protected as appropriate
2016-12-07 22:19:20 -06:00
terrafrost
c852bae3c8
use short array syntax for arrays
2016-11-30 21:29:38 -06:00
terrafrost
72a6aab872
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2016-11-29 23:18:44 -06:00
terrafrost
e34e5f5135
Merge branch '2.0'
2016-11-29 23:00:03 -06:00
terrafrost
024ac81d04
Merge branch '1.0' into 2.0
2016-11-29 19:26:11 -06:00
terrafrost
d0cb855bbc
Merge branch '1.0-suppress-unpack-errors' into 1.0
2016-11-29 19:16:16 -06:00
terrafrost
81bae5ce8b
Merge pull request #1061 from terrafrost/pkcs18-rewrite
...
RSA: refactor PKCS1/PKCS8 to facilitate re-use
2016-11-29 19:15:21 -06:00
terrafrost
6807791d42
Merge branch '2.0'
2016-11-20 11:14:48 -06:00
terrafrost
abf3899e1f
Merge branch '1.0' into 2.0
2016-11-20 11:14:35 -06:00
terrafrost
7cb66ea56e
SSH2: don't use timeout value of 0 for fsockopen
2016-11-20 11:08:53 -06:00
terrafrost
48cf16599b
suppress unpack() PHP warnings
2016-11-19 22:39:36 -06:00
terrafrost
272ae9c64c
Merge branch 'master' into pkcs18-rewrite
2016-11-17 08:10:55 -06:00
terrafrost
863ff6789b
RSA: refactor PKCS1/PKCS8 to facilitate re-use
2016-11-17 08:09:10 -06:00
terrafrost
2d2bf2990e
Merge branch '2.0'
2016-11-08 09:23:53 -06:00
terrafrost
a47eccf6f9
Merge branch '1.0' into 2.0
2016-11-08 09:22:05 -06:00
terrafrost
535104cb84
SSH2: send the identifier first, before reading it
2016-11-08 09:11:57 -06:00
terrafrost
8019baee62
BigInteger: add randomRange / randomPrimeRange
...
...and redo random / randomPrime such that they take the byte size
as the parameter instead of the range.
2016-09-17 19:48:51 -07:00
terrafrost
c17a2604a0
Merge branch 'master-reorg'
2016-09-17 09:15:11 -07:00
terrafrost
845135f887
add PHP5-style constructors along side PHP4-style ones
2016-09-10 10:41:05 -07:00
terrafrost
da0c41ddac
Merge branch '2.0'
2016-08-11 23:10:43 -05:00
terrafrost
c20b661a44
SSH2: don't check for carriage return in version id string
2016-08-11 23:09:38 -05:00
klemens
dd23d91d41
spelling fixes
2016-08-04 00:47:52 -05:00
terrafrost
c547ee16c7
Merge branch '1.0' into 2.0
2016-08-04 00:31:15 -05:00
klemens
dca95ac662
spelling fixes
2016-08-04 00:19:27 -05:00
terrafrost
c509909004
Organizational Revamp
...
- rename \phpseclib\Crypt\Base to \phpseclib\Crypt\Common\SymmetricKey
- create BlockCipher and StreamCipher to extend SymmetricKey
- replace _string_shift with \phpseclib\Common\Functions\Strings::shift
2016-07-30 22:18:06 -05:00
terrafrost
3c1985a619
Merge branch '2.0'
2016-07-10 12:56:12 -05:00