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
|
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
|
845135f887
|
add PHP5-style constructors along side PHP4-style ones
|
2016-09-10 10:41:05 -07:00 |
|
terrafrost
|
c20b661a44
|
SSH2: don't check for carriage return in version id string
|
2016-08-11 23:09:38 -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
|
97f0b37bd5
|
Merge branch '1.0' into 2.0
|
2016-07-10 12:55:56 -05:00 |
|
terrafrost
|
7bc0e61c1d
|
SSH2: fix "Expected SSH_FXP_STATUS or ..." error
|
2016-06-29 00:30:28 -05:00 |
|
terrafrost
|
8bb4592225
|
Merge branch 'stream-get-contents-1.0' into 2.0
|
2016-06-06 23:05:15 -05:00 |
|
terrafrost
|
2550301678
|
SSH2: use stream_get_* instead of fread() / fgets()
|
2016-05-23 00:46:41 -05:00 |
|
terrafrost
|
c76b18b869
|
Merge branch '1.0' into 2.0
|
2016-05-06 11:50:15 -05:00 |
|
artyhedgehog
|
0dd04d1e9b
|
Fixed confusing SSH2::getErrors return type
|
2016-05-06 11:49:24 -05:00 |
|
terrafrost
|
8fb4c3363d
|
undo merging of master to 2.0 branch
|
2016-04-28 15:34:10 -05:00 |
|
terrafrost
|
b3171cc63f
|
SFTP: fix logging constants
|
2016-04-11 19:30:45 -05:00 |
|
terrafrost
|
b4cf10fc94
|
Revert "Merge branch '2.0'"
This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing
changes made to 638fe6971c.
|
2016-04-10 11:30:59 -05:00 |
|
terrafrost
|
4b69dcb1ca
|
Revert "Merge remote-tracking branch 'bantu/bootstrap'"
This reverts commit ef04c870e9, reversing
changes made to cd57bf31ae.
|
2016-04-10 11:25:31 -05:00 |
|
terrafrost
|
574d36fb7d
|
Merge branch 'cipher-revamp'
|
2016-03-14 23:00:21 -05:00 |
|
terrafrost
|
ea7d647612
|
Merge branch 'cipher-revamp'
|
2016-03-14 22:42:51 -05:00 |
|
terrafrost
|
54deb16da8
|
Merge branch '2.0'
|
2016-03-08 16:58:15 -06:00 |
|
terrafrost
|
9e586e79f1
|
SSH2: update libsodium calls to use 1.0.0 convention
|
2016-03-08 16:57:16 -06:00 |
|
terrafrost
|
ae1e5c13f9
|
Merge branch 'master' into cipher-revamp
|
2016-02-20 21:44:00 -06:00 |
|
terrafrost
|
5c78bf4c06
|
Merge branch 'ssh-fix-publickey'
|
2016-02-20 14:19:31 -06:00 |
|
Scott
|
fc4599985a
|
Correct Sodium check
PECL Libsodium 1.0.x uses `\Sodium\function_name` instead of `\Sodium::method_name`.
|
2016-02-16 09:29:25 -06:00 |
|
Scott
|
fee6431bad
|
Correct Sodium check
PECL Libsodium 1.0.x uses `\Sodium\function_name` instead of `\Sodium::method_name`.
|
2016-02-11 15:54:27 -05:00 |
|
terrafrost
|
c2110f68a0
|
SSH: fix broken public key auth
|
2016-02-06 15:59:34 -06:00 |
|
terrafrost
|
e74841477f
|
Crypt: become a lot less tolerant of bad parameters
|
2016-02-03 08:56:25 -06:00 |
|
terrafrost
|
73a4221988
|
Crypt: become a lot less tolerant of bad parameters
|
2016-01-31 12:37:38 -06:00 |
|
terrafrost
|
ad4c3670d3
|
Merge branch 'biginteger-revamp'
|
2016-01-16 22:59:19 -06:00 |
|
terrafrost
|
a0d21b6321
|
BigInteger: make select methods static, add type hinting, etc
|
2015-12-27 10:24:17 -06:00 |
|
terrafrost
|
806249c7e9
|
RSA: changes to how encryption / signatures work
|
2015-12-25 11:28:24 -06:00 |
|
terrafrost
|
94fdbba2aa
|
Merge branch '2.0'
|
2015-12-23 23:42:23 -06:00 |
|
terrafrost
|
600f9c4e4b
|
SSH2: update isAuthenticated to work with 2.0 / master branches
|
2015-12-16 09:21:37 -06:00 |
|
terrafrost
|
d17aeffc04
|
Merge branch 'authenticated-1.0' into authenticated-2.0
|
2015-12-16 09:20:27 -06:00 |
|
terrafrost
|
57063f3604
|
SSH2: add isAuthenticated() method
|
2015-12-15 23:19:05 -06:00 |
|
terrafrost
|
ee0f45fea6
|
update identifier to current version
|
2015-12-05 10:33:28 -06:00 |
|
Andreas Fischer
|
18cc8eb1c3
|
Merge branch '2.0'
* 2.0:
Fix PHP invalid index warning
|
2015-11-24 09:28:00 +01:00 |
|
Andreas Fischer
|
d80651738f
|
Merge branch '1.0' into 2.0
* 1.0:
Fix PHP invalid index warning
|
2015-11-24 09:28:00 +01:00 |
|
splitice
|
77d5f8da20
|
Fix PHP invalid index warning
|
2015-11-24 09:13:30 +01:00 |
|
terrafrost
|
43165d976c
|
RSA: changes to OpenSSH and PuTTY plugins
|
2015-10-24 15:54:34 -05:00 |
|
terrafrost
|
a9705fdba7
|
Merge branch 'master' into rsa-plugins
Conflicts:
phpseclib/Crypt/RSA.php
|
2015-10-16 10:01:18 -05:00 |
|
terrafrost
|
8686ced6d3
|
Merge branch 'phpdoc-2.0' into phpdoc-master
Conflicts:
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RSA.php
|
2015-10-12 21:37:44 -05:00 |
|
terrafrost
|
33ea01f1ac
|
Merge branch 'phpdoc-1.0' into phpdoc-2.0
Conflicts:
phpseclib/Crypt/AES.php
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RC2.php
phpseclib/Crypt/RC4.php
phpseclib/Crypt/RSA.php
phpseclib/Crypt/Rijndael.php
phpseclib/Crypt/TripleDES.php
phpseclib/Crypt/Twofish.php
phpseclib/File/ASN1.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SCP.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
phpseclib/System/SSH/Agent.php
|
2015-10-12 14:10:26 -05:00 |
|
terrafrost
|
2048a49aac
|
use self:: in phpdoc comments to reduce merge conflicts
|
2015-10-11 12:22:07 -05:00 |
|
terrafrost
|
19229ed224
|
phpDoc changes
|
2015-10-05 13:22:51 -05:00 |
|
terrafrost
|
91887c957d
|
Merge remote-tracking branch 'upstream/master' into rsa-plugins
Conflicts:
phpseclib/Crypt/RSA.php
phpseclib/Net/SSH2.php
|
2015-10-01 15:57:31 -05:00 |
|
terrafrost
|
ec3fe7277b
|
RSA: move key format handling to plugins
|
2015-10-01 15:41:11 -05:00 |
|
Andreas Fischer
|
70f55bd156
|
Merge pull request #825 from terrafrost/rsa-revamp
RSA: make createKey static and make it return RSA objects
* terrafrost/rsa-revamp:
RSA: make createKey static and make it return RSA objects
|
2015-09-25 13:16:56 +02:00 |
|
terrafrost
|
fab5a66fe5
|
RSA: make createKey static and make it return RSA objects
|
2015-09-24 09:43:19 -05:00 |
|