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
020bcdab29
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0
2016-08-28 10:48:45 -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
6dc50cc5c9
ASN1: update unit test for 2.0 branch
2016-08-28 10:45:31 -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
77c29d774f
Merge branch '2.0'
2016-08-18 13:49:32 -05:00
terrafrost
8b4ead6aef
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2016-08-18 13:49:28 -05:00
terrafrost
41f85e9c25
Merge branch '1.0' into 2.0
2016-08-18 13:49:14 -05:00
terrafrost
c27fd2e66f
updates for 1.0.3 release
2016-08-18 13:43:04 -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
719fb8d7a8
Merge branch '2.0' of https://github.com/phpseclib/phpseclib into 2.0
2016-08-04 07:32:07 -05:00
terrafrost
e6a2ce1d6d
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0
2016-08-04 07:30:46 -05:00
terrafrost
cc75d317a8
Merge branch '2.0'
2016-08-04 01:08:20 -05:00
terrafrost
ffdac88f17
Merge branch '1.0' into 2.0
2016-08-04 01:07:55 -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
terrafrost
3a53545eb7
Merge branch '2.0'
2016-08-04 00:52:16 -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
06ed64ef3d
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2016-07-28 11:01:44 -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
a5201bf6fc
Merge branch '2.0'
2016-07-23 18:55:45 -05:00
terrafrost
e59e544ed8
Merge branch '1.0' into 2.0
2016-07-23 18:55:35 -05:00
terrafrost
62381365c8
Tests/X509: make dn more generic in unit test
2016-07-23 18:54:25 -05:00
terrafrost
f339c5adcc
Tests/X509: update test to work with master branch
2016-07-23 18:44:20 -05:00
terrafrost
a9bee37187
Merge branch '2.0'
2016-07-23 18:39:41 -05:00
terrafrost
2c4dcd96b4
fix issue with merge
2016-07-23 18:39:25 -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