terrafrost
|
2db6b8421a
|
Merge branch '2.0'
|
2016-06-04 14:56:54 -05:00 |
|
terrafrost
|
934523289a
|
CHANGELOG: update for 2.0.2 release
|
2016-06-04 14:56:30 -05:00 |
|
terrafrost
|
48fef11389
|
Merge branch 'cte'
|
2016-05-21 17:34:05 -05:00 |
|
Paragon Initiative Enterprises
|
adcbecae78
|
Use paragonie/constant_time_encoding
|
2016-05-21 12:57:53 -05:00 |
|
terrafrost
|
4cac42745e
|
Merge remote-tracking branch 'scott/v3.0-cte'
|
2016-05-21 12:00:32 -05:00 |
|
terrafrost
|
ed6ccb4bd7
|
Merge branch '2.0'
|
2016-05-12 20:15:44 -05:00 |
|
terrafrost
|
3d265f7c07
|
Merge branch '1.0' into 2.0
|
2016-05-12 20:15:21 -05:00 |
|
terrafrost
|
e3de9b7bb1
|
CHANGELOG: add entry for 1.0.2
|
2016-05-12 20:13:11 -05:00 |
|
Paragon Initiative Enterprises
|
0e8fa93676
|
Use paragonie/constant_time_encoding
|
2016-05-12 16:28:40 -04:00 |
|
terrafrost
|
a2130ff111
|
Merge branch '2.0'
|
2016-05-08 01:36:04 -05:00 |
|
terrafrost
|
c784d9e1e5
|
reapply PR #931
|
2016-05-08 01:34:37 -05:00 |
|
terrafrost
|
a3fdde757d
|
Merge branch '2.0'
|
2016-05-07 19:01:46 -05:00 |
|
terrafrost
|
511a7b77ba
|
Merge branch '1.0' into 2.0
|
2016-05-07 19:01:31 -05:00 |
|
terrafrost
|
b8f3a76632
|
README: update download link
|
2016-05-07 19:01:00 -05:00 |
|
terrafrost
|
1f138916fa
|
Merge branch '2.0'
|
2016-05-07 02:40:04 -05:00 |
|
terrafrost
|
a3d3dbd957
|
Merge branch '1.0' into 2.0
|
2016-05-07 02:39:17 -05:00 |
|
terrafrost
|
bf31e976c7
|
RSA: fix PHP4 compatability issue
|
2016-05-06 22:18:12 -05:00 |
|
terrafrost
|
43d68c6619
|
Merge branch '2.0'
|
2016-05-06 12:23:35 -05:00 |
|
terrafrost
|
700338beed
|
Merge branch '1.0' into 2.0
|
2016-05-06 11:58:07 -05:00 |
|
terrafrost
|
27d9bde6d2
|
Merge branch 'sftp_readable_writable-1.0' into 1.0
|
2016-05-06 11:55:50 -05:00 |
|
terrafrost
|
1b92fd84f9
|
Merge branch '2.0'
|
2016-05-06 11:50:26 -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
|
e762b0dc29
|
SFTP: add is_writable, is_writeable and is_readable
|
2016-05-05 16:41:15 -05:00 |
|
terrafrost
|
e47af2bd88
|
Merge branch 'master' of https://github.com/phpseclib/phpseclib
|
2016-04-30 16:26:53 -05: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
|
e40d6cc1cc
|
Hash: small tweaks per Joey3000
|
2016-04-12 11:32:40 -05:00 |
|
terrafrost
|
b3171cc63f
|
SFTP: fix logging constants
|
2016-04-11 19:30:45 -05:00 |
|
terrafrost
|
076c69fa1b
|
Merge branch '1.0' into 2.0
|
2016-04-11 15:18:50 -05:00 |
|
terrafrost
|
d22bcd63cc
|
SFTP: nlist() on a non-existent directory resulted in error
|
2016-04-11 15:18:06 -05:00 |
|
terrafrost
|
4bfeeee5a0
|
Merge branch '2.0'
|
2016-04-10 11:58:07 -05:00 |
|
terrafrost
|
8556b20220
|
Travis: rm 5.3.3 support
|
2016-04-10 11:57:58 -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
|
2cc5dcdc89
|
Merge branch '2.0'
|
2016-04-10 11:30:34 -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
|
638fe6971c
|
Merge branch 'master' of https://github.com/phpseclib/phpseclib
|
2016-04-10 10:18:49 -05:00 |
|
terrafrost
|
7dffbfde04
|
RSA/OpenSSH: savePublicKey() method should have been static
|
2016-04-10 10:18:15 -05:00 |
|
terrafrost
|
c46e8aeec6
|
Bootstrap: CS adjustments
|
2016-04-09 18:06:01 -05:00 |
|
terrafrost
|
ef04c870e9
|
Merge remote-tracking branch 'bantu/bootstrap'
|
2016-04-09 13:04:34 -05:00 |
|
terrafrost
|
263564a2ee
|
Merge branch 'master' of https://github.com/phpseclib/phpseclib
|
2016-04-09 13:00:51 -05:00 |
|
terrafrost
|
272d447b65
|
Merge branch 'sha512/x'
|
2016-04-09 12:57:34 -05:00 |
|
terrafrost
|
86646fdf40
|
RSA: PKCS1 v2.2 also added sha224
|
2016-04-09 12:57:23 -05:00 |
|
terrafrost
|
a3000aac28
|
Tests/RSA: CS adjustment
|
2016-04-03 22:56:48 -05:00 |
|
terrafrost
|
383bceb1a9
|
Tests/RSA: fix bad merge
|
2016-04-03 22:07:49 -05:00 |
|
terrafrost
|
9cf93a02b3
|
Merge branch '2.0'
|
2016-04-03 21:37:52 -05:00 |
|