1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-16 10:56:56 +01:00
Commit Graph

3707 Commits

Author SHA1 Message Date
terrafrost
0c8cfd232a Merge branch '1.0' into 2.0 2017-05-09 21:32:03 -05:00
Remi Collet
d85ee2cb3b fix permission 2017-05-09 21:30:03 -05:00
Remi Collet
9706f37644 fix permission 2017-05-08 17:23:20 +02:00
terrafrost
7882249a14 Merge branch '2.0' 2017-05-08 00:58:42 -05:00
terrafrost
f8dd0e18d2 Merge branch '1.0' into 2.0 2017-05-08 00:58:35 -05:00
terrafrost
aa8368ed12 README: add 1.0.6 release 2017-05-08 00:58:24 -05:00
terrafrost
31f4406b6e Merge branch 'master' of https://github.com/phpseclib/phpseclib 2017-05-07 15:08:36 -05:00
terrafrost
851e662544 Merge branch '2.0' 2017-05-07 15:07:18 -05:00
terrafrost
a647afa8be Merge branch '1.0' into 2.0 2017-05-07 15:07:11 -05:00
terrafrost
73c51d8e6e Travis: rm hhvm 2017-05-07 15:07:04 -05:00
terrafrost
84d40ad8e0 Merge branch '2.0' 2017-05-07 13:26:39 -05:00
terrafrost
64dd2e064b Merge branch '1.0' into 2.0 2017-05-07 13:26:27 -05:00
terrafrost
35a1102c0b SFTP: fix put() with php://input as source 2017-05-07 13:25:43 -05:00
terrafrost
3fe35a4976 Merge pull request #1115 from langemeijer/master
Refactor create_function() into anonymous function
2017-04-18 00:15:03 -05:00
Casper Langemeijer
4a0118bae6 Refactor create_function() into anonymous function 2017-04-17 15:35:00 +02:00
terrafrost
4a069f7c85 rm redundant files 2017-04-15 19:35:07 -05:00
terrafrost
4058e3e217 Merge pull request #1090 from terrafrost/dsa-test-2
add DSA implementation
2017-04-15 15:49:04 -05:00
terrafrost
0a6fe37285 Merge branch '2.0' 2017-04-09 10:30:23 -05:00
terrafrost
f4ae2cf3d3 Merge branch '1.0' into 2.0 2017-04-09 10:23:20 -05:00
Moritz Fain
7fd1eefd66 Fixed ASN.1 UTCTime parsing 2017-04-09 10:15:40 -05:00
terrafrost
22bf2339d7 Merge branch '2.0' 2017-03-07 22:20:21 -06:00
terrafrost
b646d5739c Merge branch '2.0' of https://github.com/phpseclib/phpseclib into 2.0 2017-03-07 21:55:37 -06:00
terrafrost
91a0866fdc Tests/X509: add unit test for issue involving multiple domain names 2017-03-07 21:54:41 -06:00
terrafrost
52dcabb279 Merge pull request #1104 from metaclassing/fix-array-map-namespace
namespacing the array_map function
2017-03-07 21:50:41 -06:00
Metaclassing
42a7ff61ff namespacing the array_map function 2017-03-07 15:22:44 -06:00
terrafrost
9cbf357ac5 Merge branch '2.0' 2017-03-01 22:27:31 -06:00
terrafrost
ecb92ad25c Merge branch '1.0' into 2.0 2017-03-01 22:27:00 -06:00
terrafrost
8abc0ee60c SSH2: include <pre> tags in getLog result when SAPI isn't CLI 2017-03-01 22:26:29 -06:00
terrafrost
9f4f288005 Merge branch '1.0' into 2.0 2017-03-01 22:24:59 -06:00
terrafrost
b8ceb96bd4 SSH2: include <pre> tags in getLog result when SAPI isn't CLI 2017-03-01 22:18:38 -06:00
terrafrost
42def63b00 Merge remote-tracking branch 'upstream/master' into dsa-test-2 2017-02-02 21:07:47 -05:00
terrafrost
ab1da5ac1f Merge pull request #1084 from terrafrost/php5-updates
PHP5 updates for master branch
2017-02-02 21:03:07 -05:00
terrafrost
eb459daeaf add DSA implementation 2017-02-02 20:20:47 -05:00
terrafrost
9220bcd49a fix bad merge 2017-01-27 14:44:21 -06:00
terrafrost
7d2e44b430 Merge branch '2.0' 2017-01-27 12:40:23 -06:00
terrafrost
062ee6b5b5 Tests: crypt_random_string -> Random::string 2017-01-27 12:35:48 -06:00
terrafrost
ac2b7ef76c Merge branch '1.0' into 2.0 2017-01-27 12:17:04 -06:00
terrafrost
1bde98fc42 Crypt: OpenSSL apparently supports variable size keys 2017-01-27 11:20:22 -06:00
terrafrost
8e44671766 visibility fixes 2017-01-21 15:51:49 -06:00
terrafrost
a25c841108 Merge remote-tracking branch 'upstream/master' into php5-updates 2017-01-17 22:40:24 -06:00
terrafrost
b9b4f67a0f Net: add public / private / protected 2017-01-17 10:23:28 -06:00
terrafrost
fae358cc3c BigInteger: use public / private / protected 2017-01-05 00:20:18 -06:00
Andreas Fischer
74abcb45ed Merge branch '2.0'
* 2.0:
  README: Fix typos.
2016-12-25 16:50:17 +01:00
Andreas Fischer
00325a3050 Merge branch '1.0' into 2.0
* 1.0:
  README: Fix typos.
2016-12-25 16:50:17 +01:00
Andreas Fischer
43bbe485cc Merge pull request #1078 from bantu/readme-polishing
README: Fix typos.

* bantu/readme-polishing:
  README: Fix typos.
2016-12-25 16:50:17 +01:00
Andreas Fischer
a0e6bd87f2 README: Fix typos. 2016-12-25 16:09:17 +01:00
terrafrost
c8c61055d1 Merge branch '2.0' 2016-12-24 21:34:30 -06:00
terrafrost
95335f9560 SSH2: update PTY changes for 2.0 branch 2016-12-24 21:20:13 -06:00
terrafrost
6aa31b2cd1 Merge branch '1.0' into 2.0 2016-12-24 21:10:50 -06:00
terrafrost
785b477605 Merge branch 'pty-enhancement' into 1.0 2016-12-24 20:28:19 -06:00