Commit Graph

2646 Commits

Author SHA1 Message Date
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
e6e34f3543 Merge pull request #1065 from terrafrost/asn1-revamp-pt3
ASN.1 revamp
2016-12-10 19:27:37 -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
terrafrost
d0cb855bbc Merge branch '1.0-suppress-unpack-errors' into 1.0 2016-11-29 19:16:16 -06:00
terrafrost
81bae5ce8b Merge pull request #1061 from terrafrost/pkcs18-rewrite
RSA: refactor PKCS1/PKCS8 to facilitate re-use
2016-11-29 19:15:21 -06:00
terrafrost
a4d05f8445 ASN1: rm an alternative approach for dealing with ASN1\Element 2016-11-29 08:15:08 -06:00
terrafrost
4dc3b7ed43 ASN1: don't return false after exception is thrown 2016-11-28 22:40:55 -06:00
terrafrost
370fbec300 ASN1: don't require octet / bit strings be base64-encoded 2016-11-28 20:51:21 -06:00
terrafrost
874ada8d93 ASN1: make methods static 2016-11-27 22:38:11 -06:00
terrafrost
df6d55fd97 ASN1: move ASN1 maps to external files for reuse 2016-11-22 23:56:07 -06:00
terrafrost
865904f636 Merge branch '2.0' 2016-11-20 18:13:48 -06:00
terrafrost
de3bb2e300 Merge branch '1.0' into 2.0 2016-11-20 18:13:41 -06:00
terrafrost
6fb34887c5 SFTP: change queue size to 32 (max packet size is 32kb so 32*32=1M) 2016-11-20 18:13:01 -06:00
terrafrost
ad03dcad1c Merge branch '2.0' 2016-11-20 18:05:02 -06:00
terrafrost
27a6b6362a Merge branch '1.0' into 2.0 2016-11-20 18:04:55 -06:00
terrafrost
a2d9622bf9 SFTP: update directory deletion check (#1059) 2016-11-20 18:03:01 -06:00
terrafrost
6807791d42 Merge branch '2.0' 2016-11-20 11:14:48 -06:00
terrafrost
abf3899e1f Merge branch '1.0' into 2.0 2016-11-20 11:14:35 -06:00
terrafrost
7cb66ea56e SSH2: don't use timeout value of 0 for fsockopen 2016-11-20 11:08:53 -06:00
terrafrost
48cf16599b suppress unpack() PHP warnings 2016-11-19 22:39:36 -06:00
terrafrost
b8e1a15291 Merge branch '2.0' 2016-11-19 20:40:04 -06:00
terrafrost
f981310266 Merge branch '1.0' into 2.0 2016-11-19 20:39:58 -06:00
terrafrost
b70cb87641 SFTP: don't delete directory if $path is empty 2016-11-19 20:39:05 -06:00
terrafrost
d1fa327ef9 Merge branch '2.0' 2016-11-18 20:48:18 -06:00
terrafrost
51bafdebe2 SFTP: CS adjustment 2016-11-18 20:48:01 -06:00
terrafrost
d6bf2b4f73 Merge branch '2.0' 2016-11-18 20:37:26 -06:00
terrafrost
8b4208ee60 SFTP: logging didn't work correctly in 2.0 branch 2016-11-18 20:37:08 -06:00
terrafrost
f9f95af921 Merge branch '2.0' of https://github.com/phpseclib/phpseclib into 2.0 2016-11-17 22:18:47 -06:00
terrafrost
989fc3735a Merge branch '2.0' 2016-11-17 20:55:53 -06:00
terrafrost
76f6c59244 Merge branch '1.0' into 2.0 2016-11-17 20:55:42 -06:00
terrafrost
df4ed58401 Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0 2016-11-17 20:54:56 -06:00
terrafrost
99a2127856 Hash: fix E_NOTICE with PHP4-style constructor 2016-11-17 20:54:38 -06:00
terrafrost
272ae9c64c Merge branch 'master' into pkcs18-rewrite 2016-11-17 08:10:55 -06:00
terrafrost
863ff6789b RSA: refactor PKCS1/PKCS8 to facilitate re-use 2016-11-17 08:09:10 -06:00
terrafrost
66aef4874a Merge branch 'master' of https://github.com/phpseclib/phpseclib 2016-11-08 09:51:59 -06:00
terrafrost
49c002d2c5 Merge branch '2.0' 2016-11-08 09:43:16 -06:00
terrafrost
c76b1aa709 Merge branch '1.0' into 2.0 2016-11-08 09:43:09 -06:00