terrafrost
c43ebe3a0a
Merge branch 'datetime-2.0' into datetime-master
2017-08-24 12:50:47 -05:00
terrafrost
221a9be8e6
Merge branch 'datetime-1.0' into datetime-2.0
2017-08-24 12:50:00 -05:00
terrafrost
09c17b1a31
ASN1 / X509: update to use DateTime instead of unix time
2017-08-24 12:48:15 -05:00
terrafrost
3fcce89f78
Merge remote-tracking branch 'rrran/Bugfixes'
2017-08-07 21:47:06 -05:00
terrafrost
0ac8b5d5ed
ASN1: rm unused method (decodeLength)
2017-08-06 10:30:29 -05:00
Sokolovskyy Roman
0c6d8607ce
added missing use statement
...
PHPDOC fix
2017-08-03 09:12:56 +02:00
terrafrost
0a6fe37285
Merge branch '2.0'
2017-04-09 10:30:23 -05:00
terrafrost
f4ae2cf3d3
Merge branch '1.0' into 2.0
2017-04-09 10:23:20 -05:00
Moritz Fain
7fd1eefd66
Fixed ASN.1 UTCTime parsing
2017-04-09 10:15:40 -05:00
terrafrost
242e0dcb7f
Files: add public / protected / private
2016-12-11 08:23:59 -06:00
terrafrost
7182ec393b
make classes with only static methods abstract
2016-11-30 09:25:04 -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
863ff6789b
RSA: refactor PKCS1/PKCS8 to facilitate re-use
2016-11-17 08:09:10 -06:00
terrafrost
c17a2604a0
Merge branch 'master-reorg'
2016-09-17 09:15:11 -07:00
terrafrost
845135f887
add PHP5-style constructors along side PHP4-style ones
2016-09-10 10:41:05 -07: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
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
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
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
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
Paragon Initiative Enterprises
0e8fa93676
Use paragonie/constant_time_encoding
2016-05-12 16:28:40 -04:00
terrafrost
398a795e1f
Revert "undo merging of master to 2.0 branch"
...
This reverts commit 8fb4c3363d
.
2016-04-30 16:23:35 -05:00
terrafrost
8fb4c3363d
undo merging of master to 2.0 branch
2016-04-28 15:34:10 -05:00
terrafrost
b4cf10fc94
Revert "Merge branch '2.0'"
...
This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing
changes made to 638fe6971c
.
2016-04-10 11:30:59 -05:00
terrafrost
4b69dcb1ca
Revert "Merge remote-tracking branch 'bantu/bootstrap'"
...
This reverts commit ef04c870e9
, reversing
changes made to cd57bf31ae
.
2016-04-10 11:25:31 -05:00
terrafrost
b86497d298
Merge branch '2.0'
2015-12-14 11:02:14 -06:00
terrafrost
8448f63d76
Merge branch '1.0' into 2.0
2015-12-14 11:01:51 -06:00
terrafrost
37535744b2
small tweaks
2015-11-21 22:55:20 -05:00
terrafrost
8686ced6d3
Merge branch 'phpdoc-2.0' into phpdoc-master
...
Conflicts:
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RSA.php
2015-10-12 21:37:44 -05:00
terrafrost
33ea01f1ac
Merge branch 'phpdoc-1.0' into phpdoc-2.0
...
Conflicts:
phpseclib/Crypt/AES.php
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RC2.php
phpseclib/Crypt/RC4.php
phpseclib/Crypt/RSA.php
phpseclib/Crypt/Rijndael.php
phpseclib/Crypt/TripleDES.php
phpseclib/Crypt/Twofish.php
phpseclib/File/ASN1.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SCP.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
phpseclib/System/SSH/Agent.php
2015-10-12 14:10:26 -05:00
terrafrost
2048a49aac
use self:: in phpdoc comments to reduce merge conflicts
2015-10-11 12:22:07 -05:00
Graham Campbell
7cd45e5e1b
Fixed lots of phpdoc typos
2015-09-02 00:44:55 +01:00
Graham Campbell
2be0506514
Fixed invalid param phpdoc
2015-09-02 00:44:39 +01:00
Graham Campbell
634c1c2a18
Fixed lots of phpdoc typos
2015-09-02 00:42:15 +01:00
Graham Campbell
c08c099c56
Fixed invalid param phpdoc
2015-09-02 00:41:38 +01:00