terrafrost
8b2ef543ab
Merge branch '2.0'
2018-12-01 23:14:37 -06:00
terrafrost
6b6c869bb8
Merge branch '1.0' into 2.0
2018-12-01 23:14:10 -06:00
terrafrost
363ffc9cfd
System/SSH/Agent: CS adjustment
2018-12-01 23:10:54 -06:00
terrafrost
ab49ab9dca
Merge branch '2.0'
2018-12-01 22:47:04 -06:00
terrafrost
1bb2826ab1
Merge branch '1.0' into 2.0
2018-12-01 22:46:13 -06:00
terrafrost
fbef6f009f
System/SSH/Agent: add parameter to constructor
2018-12-01 22:41:45 -06:00
terrafrost
e006f5b326
Merge branch '2.0'
2018-11-22 21:55:51 -06:00
terrafrost
f3ea7ae986
Merge branch '1.0' into 2.0
2018-11-22 21:19:33 -06:00
terrafrost
8f2a0e6f0d
System/SSH/Agent: add support for rsa-sha2-256 / rsa-sha2-512
2018-11-22 20:47:15 -06:00
terrafrost
6b275cdcd5
SSH/Agent: CS adjustment
2018-05-27 11:33:37 -05:00
terrafrost
ffb21d7622
SSH/Agent: fix bad merge
2018-05-27 11:27:19 -05:00
terrafrost
03f9a4dc7e
Merge branch '2.0'
2018-05-27 10:54:36 -05:00
terrafrost
b8bb23c9f1
Merge branch '1.0' into 2.0
2018-05-27 10:44:17 -05:00
terrafrost
39a0b652b3
SSH/Agent: add dummy setHash() method
2018-05-27 10:29:56 -05:00
Sokolovskyy Roman
f40ea062c2
Lots of PHPDoc fixes
2017-10-25 11:44:14 +02:00
Sokolovskyy Roman
55cacdf7cd
More PHPDOC fixes
2017-08-04 12:06:25 +02:00
terrafrost
8e44671766
visibility fixes
2017-01-21 15:51:49 -06:00
terrafrost
b9b4f67a0f
Net: add public / private / protected
2017-01-17 10:23:28 -06:00
terrafrost
c852bae3c8
use short array syntax for arrays
2016-11-30 21:29:38 -06: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
1a25aefa59
cherry-picking last commit added new file
2016-08-04 00:55:21 -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
Paragon Initiative Enterprises
0e8fa93676
Use paragonie/constant_time_encoding
2016-05-12 16:28:40 -04:00
terrafrost
398a795e1f
Revert "undo merging of master to 2.0 branch"
...
This reverts commit 8fb4c3363d
.
2016-04-30 16:23:35 -05:00
terrafrost
8fb4c3363d
undo merging of master to 2.0 branch
2016-04-28 15:34:10 -05:00
terrafrost
ceb6dc0255
System/SSH/Agent: fix namespacing on BadConfigurationException
2016-04-10 11:48:08 -05:00
terrafrost
324a973ec1
Merge branch '2.0'
2016-04-10 11:39:55 -05:00
terrafrost
4e4397afc9
Merge branch '1.0' into 2.0
2016-04-10 11:38:03 -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
6a97ddfa72
SSH/Agent: if comment is empty don't include it
2016-04-10 10:58:49 -05:00
terrafrost
c2110f68a0
SSH: fix broken public key auth
2016-02-06 15:59:34 -06:00
Joey3000
c9a80ff748
Cleanup of use
operator usage
...
This does the following:
1. Removes superfluous usage of the `use` operator. Specifically, that operator is not needed to use classes in the same `namespace` as the object (see https://secure.php.net/manual/en/language.namespaces.rules.php ).
2. While at it, also sorted the `use` operators alphabetically, for a better overview.
2016-01-18 05:05:31 +01:00
terrafrost
999cc470b1
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2016-01-16 22:59:38 -06:00
terrafrost
f8a92a7e40
Merge branch '2.0'
2016-01-13 16:51:48 -06:00
terrafrost
b6899d9e79
Merge branch '1.0' into 2.0
2016-01-13 16:51:33 -06:00
terrafrost
0905143fc1
SSH/Agent: fix possible PHP Warning
2016-01-13 16:51:12 -06:00
terrafrost
c85b356b18
RSA: more updates per Joey3000
2016-01-07 22:26:10 -06:00
terrafrost
d5a359b41e
RSA: updates per Joey3000
2016-01-03 13:03:58 -06:00
terrafrost
806249c7e9
RSA: changes to how encryption / signatures work
2015-12-25 11:28:24 -06: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
fab5a66fe5
RSA: make createKey static and make it return RSA objects
2015-09-24 09:43:19 -05:00
Graham Campbell
7cd45e5e1b
Fixed lots of phpdoc typos
2015-09-02 00:44:55 +01:00
Graham Campbell
634c1c2a18
Fixed lots of phpdoc typos
2015-09-02 00:42:15 +01:00