Commit Graph

2680 Commits

Author SHA1 Message Date
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
ab1da5ac1f Merge pull request #1084 from terrafrost/php5-updates
PHP5 updates for master branch
2017-02-02 21:03:07 -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
terrafrost
68b5a8896f Merge branch '2.0' 2016-12-24 20:06:51 -06:00
terrafrost
f74ba2c581 Merge branch '1.0' into 2.0 2016-12-24 19:49:30 -06:00
terrafrost
a4ac7c99a7 Merge branch 'readme-polishing' into 1.0 2016-12-24 19:14:43 -06:00
Andreas Fischer
c7390e26f5 README: Reword 1.0 PEAR installation instructions. 2016-12-18 11:08:04 +01:00
Andreas Fischer
804cade3c0 README: Add branches section. 2016-12-18 11:02:41 +01:00
Andreas Fischer
bd5b8809e8 README: Merge 'Installing Development Dependencies' into 'Contributing'. 2016-12-18 10:40:25 +01:00
Andreas Fischer
d0d26cd29f README: Remove pipe into php. 2016-12-18 10:38:28 +01:00
Andreas Fischer
3cebd4ec59 README: Update Coverage and API URLs. 2016-12-18 10:32:35 +01:00
terrafrost
da6e5211df X509: ignore certificate transparency extension 2016-12-17 17:41:56 -06:00
terrafrost
2a7c99ef1b ... 2016-12-17 17:22:11 -06:00
terrafrost
a72a168400 Merge branch '1.0' into 2.0 2016-12-17 17:03:08 -06:00
vladimirghetau
d80794b1d9 exec authentication, code reuse 2016-12-17 16:37:04 -06:00
terrafrost
b26f14e5fe SSH2: make it so disabling PTY closes exec() channel if it's open 2016-12-17 16:09:48 -06:00
terrafrost
9ae5206588 RSA: setEngine -> setPreferredEngine (make it like SymmetricKey) 2016-12-11 09:59:50 -06:00
terrafrost
242e0dcb7f Files: add public / protected / private 2016-12-11 08:23:59 -06:00
terrafrost
e6e34f3543 Merge pull request #1065 from terrafrost/asn1-revamp-pt3
ASN.1 revamp
2016-12-10 19:27:37 -06:00
terrafrost
1dfd315725 RSA: use public / private / protected 2016-12-10 19:09:54 -06:00
terrafrost
813b85b5b2 Crypt: define visibility for more variables / methods 2016-12-09 16:46:01 -06:00
terrafrost
067c1882e5 SymmetricCiphers: rm some redundant methods / variables 2016-12-09 15:51:31 -06:00
terrafrost
d34a911402 SymmetricCiphers: don't cache "hi-optimized code"
Also add a new engine - ENGINE_EVAL. Previously ENGINE_INTERNAL
had three different modes - a "hi-optimized" version, a
"lo-optimized" version and a version that didn't depend on
create_function and there wasn't a way to really isolate these
modes and test them individually.
2016-12-08 09:20:19 -06:00
terrafrost
2a1177b256 SymmetricCiphers: add public / private / protected as appropriate 2016-12-07 22:19:20 -06:00
terrafrost
496fb80020 Strings: make this an abstract class as well 2016-11-30 21:43:03 -06:00
terrafrost
c852bae3c8 use short array syntax for arrays 2016-11-30 21:29:38 -06:00
terrafrost
7182ec393b make classes with only static methods abstract 2016-11-30 09:25:04 -06:00
terrafrost
72a6aab872 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2016-11-29 23:18:44 -06:00
terrafrost
e34e5f5135 Merge branch '2.0' 2016-11-29 23:00:03 -06:00
terrafrost
024ac81d04 Merge branch '1.0' into 2.0 2016-11-29 19:26:11 -06:00