terrafrost
7eb0712a01
Merge branch '2.0'
2016-07-19 23:52:15 -05:00
terrafrost
485b8e0463
Merge branch '1.0' into 2.0
2016-07-19 23:52:09 -05:00
terrafrost
d525aa66f2
ASN1: adjust ordering of SET OF values
2016-07-19 23:48:23 -05:00
terrafrost
f7585d99d1
Merge branch '2.0'
2016-07-10 13:22:09 -05:00
terrafrost
a21f3e5132
Merge branch '1.0' into 2.0
2016-07-10 13:22:03 -05:00
terrafrost
cb4a6df10c
SFTP: make symlink support relative target's
2016-07-10 13:11:24 -05:00
terrafrost
3c1985a619
Merge branch '2.0'
2016-07-10 12:56:12 -05:00
terrafrost
97f0b37bd5
Merge branch '1.0' into 2.0
2016-07-10 12:55:56 -05:00
terrafrost
7bc0e61c1d
SSH2: fix "Expected SSH_FXP_STATUS or ..." error
2016-06-29 00:30:28 -05:00
terrafrost
8530cbca1a
Tests/SFTP: demo "Expected SSH_FXP_STATUS or ..." error
2016-06-29 00:18:35 -05:00
terrafrost
a490e06b48
Merge branch '2.0'
2016-06-26 20:43:33 -05:00
terrafrost
17a14eceb2
Merge branch '1.0' into 2.0
2016-06-26 20:34:15 -05:00
John Sterling
88ce26f8ca
Improve performance of File\X509->_mapInExtensions() for large arrays
...
This avoids passing array references by-value to is_array()
(which would trigger a copy) by refactoring _subArray() into
a separate is_array() check on a by-value var, and a separate
unchecked reference return.
2016-06-26 19:44:48 -05:00
John Sterling
a1e16797ca
Improve performance of File\ASN1->_decode_ber() for large data
...
This removes the use of _string_shift() which copies the (potentially large)
latter part of the input data repeatedly, in favor of maintaining a position var
and using string indexing or substr() to only copy the (relatively small)
current data as it is parsed.
2016-06-26 19:39:44 -05:00
terrafrost
552980b086
Merge branch '2.0'
2016-06-22 12:39:02 -05:00
terrafrost
b4c7505148
Travis: a dev dep broke bc by upping the php reqs
2016-06-22 12:36:35 -05:00
terrafrost
e5dbb1bc25
Merge branch '2.0'
2016-06-22 10:17:07 -05:00
terrafrost
0c6c223134
Merge branch '1.0' into 2.0
2016-06-22 10:16:58 -05:00
terrafrost
c788ec574f
Hash: CS adjustment
2016-06-22 10:10:32 -05:00
terrafrost
0e235a1331
Merge branch '2.0' of https://github.com/terrafrost/phpseclib into 2.0
2016-06-22 09:57:24 -05:00
terrafrost
fadefe5594
Merge branch '1.0' of https://github.com/terrafrost/phpseclib into 1.0
2016-06-22 09:57:11 -05:00
terrafrost
1e7bfe75b1
Tests/RSA: fix bad merge
2016-06-22 09:47:56 -05:00
terrafrost
4516227f13
Merge branch '2.0'
2016-06-21 22:55:33 -05:00
terrafrost
9ce8a39204
Tests/RSA: update unit test to work on 2.0 branch
2016-06-21 22:39:33 -05:00
terrafrost
b08f17f514
Merge branch '1.0' into 2.0
2016-06-21 22:39:05 -05:00
terrafrost
5b8985447c
Tests/RSA: update unit test to work with 1.0 branch
2016-06-21 22:38:37 -05:00
andrewbelcher
dd754283bb
Fix zero salt length RSA signatures.
2016-06-21 22:33:47 -05:00
terrafrost
1c4fe6b5ba
Merge branch 'unsupported-hash-update'
2016-06-19 19:47:04 -05:00
terrafrost
15f0c3e5e6
Merge branch '2.0'
2016-06-19 19:45:08 -05:00
terrafrost
eeb65b2341
Merge branch '1.0' into 2.0
2016-06-19 19:45:00 -05:00
Mathieu Pipet
6c8affcf11
fixed sending stream resulting in a zero byte file
2016-06-19 19:44:06 -05:00
terrafrost
5b464a169a
Merge branch '2.0'
2016-06-19 10:54:43 -05:00
terrafrost
0121b45011
Merge branch '1.0' into 2.0
2016-06-19 10:53:45 -05:00
terrafrost
b6801c837c
X509: set parameter fields to null for CSR's / RSA
2016-06-19 10:53:20 -05:00
terrafrost
52014b25d2
Merge branch '2.0'
2016-06-18 23:33:58 -05:00
terrafrost
7bdb09c4bd
Merge branch '1.0' into 2.0
2016-06-18 23:29:33 -05:00
terrafrost
6ff421d354
BigInteger/RSA: don't compare openssl versions > 1.0
2016-06-18 23:28:33 -05:00
terrafrost
ffe912d621
rm PHP 5.3 / 5.4 from .travis.yml
...
I guess one of phpseclib's require-dev dependencies broke BC by
upping the version requirements..
2016-06-18 20:50:38 -05:00
terrafrost
e7bf628613
composer.lock update
2016-06-18 20:33:46 -05:00
terrafrost
f815e43077
Merge branch '2.0'
2016-06-12 14:19:56 -05:00
terrafrost
97c8d9eff3
Merge branch '1.0' into 2.0
2016-06-12 14:19:42 -05:00
terrafrost
a2e77a7728
Merge branch 'x509-constructed-dns-2.0' into 2.0
2016-06-12 14:19:39 -05:00
terrafrost
002a927746
Merge branch 'x509-constructed-dns' into 1.0
2016-06-12 14:19:08 -05:00
terrafrost
7a628c62b0
don't do phpinfo() check
2016-06-11 20:29:02 -05:00
terrafrost
68a09b8af0
SSH2: i incorrectly thought i had saved when i did git commit -a
2016-06-11 19:38:23 -05:00
terrafrost
2bae0c3881
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2016-06-11 19:17:15 -05:00
terrafrost
414b980b83
Merge branch '2.0'
2016-06-11 19:16:25 -05:00
terrafrost
8bb4592225
Merge branch 'stream-get-contents-1.0' into 2.0
2016-06-06 23:05:15 -05:00
terrafrost
a06ca1d212
Merge pull request #997 from DennisBirkholz/pull-change-defaults
...
Change default signature algorithm from SHA1 to SHA256
2016-06-05 11:35:48 -05:00
terrafrost
e64a55955f
Crypt/Base: trie -> true
2016-06-05 11:28:28 -05:00