Commit Graph

2412 Commits

Author SHA1 Message Date
terrafrost
1be0ac9f7f SFTP/Stream: fix issue with filenames with hash in them 2015-12-23 13:13:06 -06:00
terrafrost
d86550f5de Merge remote-tracking branch 'origin/authenticated-2.0' into 2.0 2015-12-16 21:03:27 -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
b1deba5a28 Merge branch '2.0' 2015-12-14 13:56:27 -06:00
terrafrost
eac8613c75 BigInteger: 2.0 specific updates for __debuginfo 2015-12-14 13:56:07 -06:00
terrafrost
adf6ea07e8 Merge branch '2.0' 2015-12-14 13:28:50 -06:00
terrafrost
89af727f32 Merge branch '1.0' into 2.0 2015-12-14 13:28:10 -06:00
terrafrost
cae579a19b Tests/BigInteger: update testDebugInfo test 2015-12-14 13:26:56 -06:00
terrafrost
9f529623da Merge branch '2.0' 2015-12-14 13:03:24 -06:00
terrafrost
2d2f359300 Tests/BigInteger: fix for 2.0 branch 2015-12-14 13:03:07 -06:00
terrafrost
688bce91e4 Merge branch '2.0' 2015-12-14 11:08:16 -06:00
terrafrost
6d2c25b954 Merge branch 'identifier-update-2.0' into 2.0 2015-12-14 11:08:04 -06:00
terrafrost
786cecf309 Merge branch '1.0' into identifier-update-1.0 2015-12-14 11:07:42 -06:00
terrafrost
097261411b Merge branch '2.0' 2015-12-14 11:03:20 -06:00
terrafrost
40dd0eb180 Merge branch 'rsa-pkcs8-fix-master-2' 2015-12-14 11:03:13 -06:00
terrafrost
b95504ac8f Merge branch 'rsa-pkcs8-fix-2.0-2' into 2.0 2015-12-14 11:02:49 -06:00
terrafrost
b86497d298 Merge branch '2.0' 2015-12-14 11:02:14 -06:00
terrafrost
8448f63d76 Merge branch '1.0' into 2.0 2015-12-14 11:01:51 -06:00
terrafrost
b9ce54aae9 Travis: re-add hhvm and use zenovich github repo only 2015-12-13 16:16:50 -06:00
terrafrost
f17f1b2baf Merge branch '1.0' of https://github.com/phpseclib/phpseclib into small-tweaks-2 2015-12-11 13:44:39 -06:00
terrafrost
67b12bf102 Merge branch 'rsa-pkcs8-fix-2.0-2' into rsa-pkcs8-fix-master-2
Conflicts:
	phpseclib/Crypt/RSA.php
2015-12-08 00:00:29 -06:00
terrafrost
1c9ee4ef28 RSA: fix PKCS8 key handling (again) 2015-12-07 23:53:09 -06:00
terrafrost
d8b74a7ee0 SSH2: update unit test 2015-12-07 22:02:02 -06:00
terrafrost
c655b16f75 BigInteger: add engine to __debugInfo output and add unit test 2015-12-07 15:22:53 -06:00
terrafrost
09786e2f17 Merge branch '2.0' into identifier-update-2.0 2015-12-07 15:21:05 -06:00
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