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
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
2d2bf2990e
Merge branch '2.0'
2016-11-08 09:23:53 -06:00
terrafrost
a47eccf6f9
Merge branch '1.0' into 2.0
2016-11-08 09:22:05 -06:00
terrafrost
535104cb84
SSH2: send the identifier first, before reading it
2016-11-08 09:11:57 -06:00
Łukasz Bajsarowicz
e837cc2054
Incorrect namespace hint
2016-11-04 02:25:56 -05:00
terrafrost
88e58c75d0
don't go out of our way to support < PHP 5.3
...
...not when phpseclib 2.0 requires PHP 5.3+
2016-10-02 22:07:33 -05:00
terrafrost
7ae4ea3e71
Merge branch '1.0' into 2.0
2016-10-02 21:56:59 -05:00
terrafrost
3c149e0e6a
Merge branch '1.0-32bit-fixes' into 1.0
2016-10-02 21:39:16 -05:00
terrafrost
711079764e
Merge branch '2.0'
2016-10-02 08:18:16 -05:00
terrafrost
42f5399960
Crypt/Base: fix bad merge
2016-10-02 08:09:54 -05:00
terrafrost
42fb96db16
fix float to int conversions on 32-bit linux PHP < 5.3 installs
2016-10-02 03:37:23 -05:00
terrafrost
3205c95177
Merge branch '1.0' into 2.0
2016-10-01 20:05:16 -05:00
terrafrost
d68975117c
RC2: rm empty constructor
2016-09-23 21:55:26 -05:00
terrafrost
a862837a9a
Merge remote-tracking branch 'origin/danog2'
2016-09-23 10:20:07 -05:00
terrafrost
640f10609f
fix PHP 7.1 compatibility errors
2016-09-21 01:21:54 -05:00
terrafrost
8019baee62
BigInteger: add randomRange / randomPrimeRange
...
...and redo random / randomPrime such that they take the byte size
as the parameter instead of the range.
2016-09-17 19:48:51 -07:00
terrafrost
c17a2604a0
Merge branch 'master-reorg'
2016-09-17 09:15:11 -07:00
terrafrost
c1d407d7cf
Merge branch '1.0' into 2.0
2016-09-11 21:22:53 -07:00
terrafrost
ff7bc85a8f
SFTP: backport "parallel" upload code from master branch
2016-09-11 21:11:52 -07:00
terrafrost
03937a7933
Merge branch '2.0'
2016-09-10 11:16:52 -07:00
terrafrost
222ad56285
Merge branch '1.0' into 2.0
2016-09-10 11:04:52 -07:00
terrafrost
845135f887
add PHP5-style constructors along side PHP4-style ones
2016-09-10 10:41:05 -07:00
terrafrost
0ee24aa218
BigInteger: rm loopforeach method
2016-09-09 20:59:54 -08:00
terrafrost
72d1bdf60b
a few changes to danog's changes
2016-09-08 00:22:30 -08:00
terrafrost
6f22a957c2
Merge branch '2.0'
2016-08-28 23:17:11 -05:00
terrafrost
f30f8045fd
Merge branch '1.0' into 2.0
2016-08-28 23:17:06 -05:00
Michel Bardelmeijer
1eda62913a
Handle empty fread return correctly which resolves zero-byte file issues
2016-08-28 23:16:53 -05:00
terrafrost
80440047e8
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2016-08-28 10:45:48 -05:00
terrafrost
5416b9eddc
Merge branch '2.0'
2016-08-28 10:45:37 -05:00
terrafrost
281cfcdcea
Merge branch '1.0' into 2.0
2016-08-28 10:45:04 -05:00
terrafrost
5c2ffd2544
ASN1: fix infinite loop during ASN1 decode process
2016-08-28 10:43:33 -05:00
terrafrost
47faa5736e
RSA/PKCS8: CS adjustment
2016-08-18 14:53:21 -05:00
terrafrost
8b4ead6aef
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2016-08-18 13:49:28 -05:00
terrafrost
da0c41ddac
Merge branch '2.0'
2016-08-11 23:10:43 -05:00
terrafrost
c20b661a44
SSH2: don't check for carriage return in version id string
2016-08-11 23:09:38 -05:00
terrafrost
12f70270cd
fix bad cherry pick
2016-08-04 01:06:52 -05:00
terrafrost
676c1982c7
fix bad merge
2016-08-04 01:04:00 -05:00
terrafrost
1a25aefa59
cherry-picking last commit added new file
2016-08-04 00:55:21 -05:00
klemens
dd23d91d41
spelling fixes
2016-08-04 00:47:52 -05:00
terrafrost
c547ee16c7
Merge branch '1.0' into 2.0
2016-08-04 00:31:15 -05:00
klemens
dca95ac662
spelling fixes
2016-08-04 00:19:27 -05:00
danogentili
7cf300984c
Added root, pow, max, min, loopforeach functions and tests.
2016-08-03 10:51:19 -04:00
terrafrost
d64599f799
Move _encodeLength and _decodeLength to Common\Functions\ASN1.php
2016-07-31 09:37:13 -05:00
terrafrost
c509909004
Organizational Revamp
...
- rename \phpseclib\Crypt\Base to \phpseclib\Crypt\Common\SymmetricKey
- create BlockCipher and StreamCipher to extend SymmetricKey
- replace _string_shift with \phpseclib\Common\Functions\Strings::shift
2016-07-30 22:18:06 -05:00
terrafrost
ec62e5d9f5
RSA: update PKCS1/8 comments
2016-07-28 22:14:37 -05:00
terrafrost
c12500cace
RSA: code cleanup
2016-07-28 13:08:47 -05:00
terrafrost
caa7eed299
Merge branch '2.0'
2016-07-28 11:00:33 -05:00
terrafrost
eff01fba0e
RSA: update phpdoc for 2.0 branch
2016-07-28 11:00:16 -05:00
terrafrost
61d0326bb6
Merge branch '1.0' into 2.0
2016-07-28 10:59:37 -05:00
terrafrost
b9f072bf03
RSA: phpdoc updates
2016-07-28 10:58:27 -05:00
terrafrost
a9bee37187
Merge branch '2.0'
2016-07-23 18:39:41 -05:00
terrafrost
dbdba0b7ef
Merge branch '1.0' into 2.0
2016-07-23 18:16:52 -05:00
terrafrost
dc7f7e4d85
ASN1: fix PHP Warning on PHP 7.1
2016-07-23 11:01:43 -05:00
terrafrost
d31c89a8ae
Merge branch '2.0'
2016-07-20 00:18:17 -05:00
terrafrost
6c0575f8db
ASN1: update code to use 2.0-style constants
2016-07-20 00:17:24 -05:00
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
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
c788ec574f
Hash: CS adjustment
2016-06-22 10:10:32 -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