octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-14 09:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,635 Commits 4 Branches 121 Tags 19 MiB
bcdb4b6c4a
Commit Graph

2635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
terrafrost
faa977c587 Merge branch '1.0' into identifier-update-1.0 2015-12-07 15:20:45 -06:00
terrafrost
17e4bb8837 Merge branch '2.0' 2015-12-07 15:18:42 -06:00
terrafrost
8eb581a430 Merge branch 'travis-fix-1.0' into 2.0 
Conflicts:
	.travis.yml
 2015-12-07 15:18:21 -06:00
terrafrost
fe6e60c5bd Travis: rm hhvm 2015-12-07 15:00:17 -06:00
terrafrost
c0632bb8af Travis: compile GNU Parallel 2015-12-06 23:30:37 -06:00
terrafrost
ddf55b8009 Merge branch 'identifier-update-1.0' into identifier-update-2.0 
Conflicts:
	phpseclib/Net/SSH2.php
 2015-12-05 10:35:30 -06:00
terrafrost
ee0f45fea6 update identifier to current version 2015-12-05 10:33:28 -06:00
Andreas Fischer
9f0f8fd7e5 Correct indentation on pvno array definition. 2015-12-05 10:33:28 -06:00
terrafrost
041ece8b6c Merge branch 'identifier-update-1.0' into 2.0 
Conflicts:
	phpseclib/Net/SSH2.php
 2015-12-05 10:30:08 -06:00
terrafrost
fe404065f1 update identifier to current version 2015-12-05 10:27:51 -06:00
terrafrost
b5ac556213 Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0 2015-12-05 10:27:07 -06:00
Andreas Fischer
27bf47e7a4 Merge branch '2.0' 
* 2.0:
  Correct indentation on pvno array definition.
 2015-12-01 10:06:20 +01:00
Andreas Fischer
694579617e Merge branch '1.0' into 2.0 
* 1.0:
  Correct indentation on pvno array definition.
 2015-12-01 10:06:19 +01:00
Andreas Fischer
45dd6651af Merge pull request #885 from bantu/fix-884-1.0 
Correct indentation on pvno array definition.

* bantu/fix-884-1.0:
  Correct indentation on pvno array definition.
 2015-12-01 10:06:19 +01:00
Andreas Fischer
2e8e4bf04a Correct indentation on pvno array definition. 2015-11-29 18:44:21 +01: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
Andreas Fischer
ae99173aed Merge pull request #883 from bantu/pr-876-1.0 
Fix PHP invalid index warning

* bantu/pr-876-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
37535744b2 small tweaks 2015-11-21 22:55:20 -05:00
Andreas Fischer
e7cf8ae383 Merge branch '2.0' 
* 2.0:
  README: Use the svg Travis image
 2015-11-19 09:38:20 +01:00
Andreas Fischer
43e8bb8273 Merge branch '1.0' into 2.0 
* 1.0:
  README: Use the svg Travis image
 2015-11-19 09:37:14 +01:00
Andreas Fischer
1021eb3ab1 Merge pull request #875 from bantu/travis-status-image-update-1.0 
README: Use the svg Travis image

* bantu/travis-status-image-update-1.0:
  README: Use the svg Travis image
 2015-11-19 09:36:44 +01:00
Kevin Ji
e9e5c412ad README: Use the svg Travis image 2015-11-19 09:22:46 +01:00
Andreas Fischer
230cc88327 Merge branch '2.0' 
* 2.0:
  Removed the deprecated "--dev" argument from the recommended composer command.  When that argument is specified, composer prints the following:
 2015-11-10 10:23:08 +01:00
Andreas Fischer
2f5dbc1711 Merge pull request #868 from bantu/composer_test_message-2.0 
Removed the deprecated "--dev" argument from the recommended composer…

* bantu/composer_test_message-2.0:
  Removed the deprecated "--dev" argument from the recommended composer command.  When that argument is specified, composer prints the following:
 2015-11-10 10:23:08 +01:00
Andreas Fischer
3793f34876 Merge branch '2.0' 
* 2.0:
  RSA: fix issue with loading PKCS8 specific keys
  Tests/RSA: add unit test for loading PKCS8 specific keys
 2015-11-10 10:13:32 +01:00
Andreas Fischer
466ad666b8 Merge branch '1.0' into 2.0 
* 1.0:
 2015-11-10 10:05:06 +01:00
Andreas Fischer
432b88dccc Merge pull request #866 from terrafrost/rsa-pkcs8-fix-2.0 
RSA: PKCS8 constant fix for 2.0 branch

* terrafrost/rsa-pkcs8-fix-2.0:
  RSA: fix issue with loading PKCS8 specific keys
  Tests/RSA: add unit test for loading PKCS8 specific keys
 2015-11-10 10:04:42 +01:00
Andreas Fischer
8abb069478 Merge pull request #865 from terrafrost/rsa-pkcs8-fix 
RSA: PKCS8 constant fix for 1.0 branch

* terrafrost/rsa-pkcs8-fix:
  RSA: fix issue with loading PKCS8 specific keys
  Tests/RSA: add unit test for loading PKCS8 specific keys
 2015-11-10 10:04:31 +01:00
Mark McEver
1a7d9aafd7 Removed the deprecated "--dev" argument from the recommended composer command. When that argument is specified, composer prints the following: 
You are using the deprecated option "dev". Dev packages are installed by default now.
 2015-11-10 09:49:19 +01:00
Andreas Fischer
ac7c4b83e4 Merge branch '2.0' 
* 2.0:
  Removed the deprecated "--dev" argument from the recommended composer command.  When that argument is specified, composer prints the following:
 2015-11-10 09:45:42 +01:00
Andreas Fischer
98ae83482b Merge branch '1.0' into 2.0 
* 1.0:
  Removed the deprecated "--dev" argument from the recommended composer command.  When that argument is specified, composer prints the following:
 2015-11-10 09:45:42 +01:00
Andreas Fischer
0f7ec36e3e Merge pull request #863 from mmcev106/composer_test_message_1.0 
Removed the deprecated "--dev" argument from the recommended composer…

* mmcev106/composer_test_message_1.0:
  Removed the deprecated "--dev" argument from the recommended composer command.  When that argument is specified, composer prints the following:
 2015-11-10 09:45:42 +01:00
terrafrost
c34be16c3a Merge branch 'rsa-pkcs8-fix' into rsa-pkcs8-fix-2.0 
Conflicts:
	phpseclib/Crypt/RSA.php
 2015-11-09 23:10:21 -06:00
terrafrost
7339112e10 RSA: fix issue with loading PKCS8 specific keys 2015-11-09 22:53:50 -06:00
terrafrost
e8d75b2e8d Tests/RSA: add unit test for loading PKCS8 specific keys 2015-11-09 22:10:08 -06:00
Mark McEver
c1659a5842 Removed the deprecated "--dev" argument from the recommended composer command. When that argument is specified, composer prints the following: 
You are using the deprecated option "dev". Dev packages are installed by default now.
 2015-11-08 09:30:22 -06:00
terrafrost
43165d976c RSA: changes to OpenSSH and PuTTY plugins 2015-10-24 15:54:34 -05:00
terrafrost
7b1b7c22e2 RSA: throw an exception if the modulo is too small 2015-10-23 13:45:35 -05:00
terrafrost
1522e6606b RSA: add getSupportedFormats() and getLoadedFormat() 2015-10-22 10:57:05 -05:00
terrafrost
efe36d67ce Merge branch 'master' into rsa-plugins 
Conflicts:
	phpseclib/Crypt/RSA.php
 2015-10-22 10:16:52 -05:00
terrafrost
33bf6e42c3 Merge branch '2.0' 2015-10-22 10:14:50 -05:00
terrafrost
96dd14fd6f Merge branch 'extractber-fix' into extractber-fix-2.0 
Conflicts:
	phpseclib/File/X509.php
 2015-10-22 09:56:07 -05:00
terrafrost
46bb95a265 X509: improve base64-encoded detection rules 2015-10-22 09:45:40 -05:00
terrafrost
e2fcd9d951 RSA: misc fixes to select plugins 2015-10-21 21:24:12 -05:00
terrafrost
6eb5ea3ef7 RSA: add support for the microsoft BLOB key format 2015-10-20 23:17:11 -05:00
Andreas Fischer
a88047f242 Merge branch '2.0' 
* 2.0:
  Add test case for GitHub Issue 850: Realpath in SFTP chmod().
  Fixed a bug in SFTP::chmod not using realpath on the filepath
 2015-10-19 00:19:08 +02:00
Andreas Fischer
1cf70d27e8 Merge branch '1.0' into 2.0 
* 1.0:
  Add test case for GitHub Issue 850: Realpath in SFTP chmod().
  Fixed a bug in SFTP::chmod not using realpath on the filepath
 2015-10-19 00:19:07 +02:00
Andreas Fischer
dd34eb1c30 Merge pull request #852 from bantu/sftp-chmod-realpath 
Fix SFTP::chmod not using realpath on the filepath

* bantu/sftp-chmod-realpath:
  Add test case for GitHub Issue 850: Realpath in SFTP chmod().
  Fixed a bug in SFTP::chmod not using realpath on the filepath
 2015-10-19 00:19:07 +02:00