terrafrost
5c792f6bc1
ANSI: fix E_NOTICE when overflowing text overflows screen vertical
2017-08-08 21:44:22 -05:00
terrafrost
3fcce89f78
Merge remote-tracking branch 'rrran/Bugfixes'
2017-08-07 21:47:06 -05:00
terrafrost
9f540a82e6
minor fixes to X509 and SSH2
2017-08-06 17:29:30 -05:00
terrafrost
0ac8b5d5ed
ASN1: rm unused method (decodeLength)
2017-08-06 10:30:29 -05:00
Sokolovskyy Roman
55cacdf7cd
More PHPDOC fixes
2017-08-04 12:06:25 +02:00
Sokolovskyy Roman
eb21fb2bcb
Default value for a parameter missed
2017-08-03 11:25:20 +02:00
Sokolovskyy Roman
f48995ac96
Wrong class name fix
...
PHPDOC fixes
2017-08-03 09:13:44 +02:00
Sokolovskyy Roman
0c6d8607ce
added missing use statement
...
PHPDOC fix
2017-08-03 09:12:56 +02:00
terrafrost
669a7542ea
Merge branch '2.0'
2017-07-16 11:32:15 -05:00
terrafrost
de18148e80
Merge branch '1.0' into 2.0
2017-07-16 11:32:04 -05:00
terrafrost
84d1628cb7
ANSI: make it so x position can't be negative
2017-07-16 11:31:25 -05:00
terrafrost
baeb68eb82
Merge branch '2.0'
2017-05-14 08:50:57 -05:00
terrafrost
4b24877a2c
Merge branch '1.0' into 2.0
2017-05-14 08:50:13 -05:00
terrafrost
19c71e4a98
X509: include subjectaltname extension even if only one domain name
2017-05-14 08:49:04 -05:00
Casper Langemeijer
4a0118bae6
Refactor create_function() into anonymous function
2017-04-17 15:35:00 +02:00
terrafrost
4058e3e217
Merge pull request #1090 from terrafrost/dsa-test-2
...
add DSA implementation
2017-04-15 15:49:04 -05: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
22bf2339d7
Merge branch '2.0'
2017-03-07 22:20:21 -06:00
terrafrost
52dcabb279
Merge pull request #1104 from metaclassing/fix-array-map-namespace
...
namespacing the array_map function
2017-03-07 21:50:41 -06:00
Metaclassing
42a7ff61ff
namespacing the array_map function
2017-03-07 15:22:44 -06:00
terrafrost
42def63b00
Merge remote-tracking branch 'upstream/master' into dsa-test-2
2017-02-02 21:07:47 -05:00
terrafrost
eb459daeaf
add DSA implementation
2017-02-02 20:20:47 -05:00
terrafrost
a25c841108
Merge remote-tracking branch 'upstream/master' into php5-updates
2017-01-17 22:40:24 -06:00
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
da6e5211df
X509: ignore certificate transparency extension
2016-12-17 17:41:56 -06:00
terrafrost
242e0dcb7f
Files: add public / protected / private
2016-12-11 08:23:59 -06:00
terrafrost
c852bae3c8
use short array syntax for arrays
2016-11-30 21:29:38 -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
676c1982c7
fix bad merge
2016-08-04 01:04:00 -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
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
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
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
f815e43077
Merge branch '2.0'
2016-06-12 14:19:56 -05:00
terrafrost
a2e77a7728
Merge branch 'x509-constructed-dns-2.0' into 2.0
2016-06-12 14:19:39 -05:00
Dennis Birkholz
18200131df
Change default signature algorithm from SHA1 to SHA256
2016-06-05 18:09:00 +02:00
Paragon Initiative Enterprises
0e8fa93676
Use paragonie/constant_time_encoding
2016-05-12 16:28:40 -04:00
terrafrost
c784d9e1e5
reapply PR #931
2016-05-08 01:34:37 -05:00
terrafrost
305dc1967a
Tests/X509: fix bad merge
2016-05-04 00:16:08 -05:00
terrafrost
538b48c346
Merge branch 'x509-constructed-dns' into x509-constructed-dns-2.0
2016-05-03 20:06:48 -05:00
terrafrost
52a7aee1f5
X509: add support for constructed DNs and non-strict DN checks
2016-05-03 18:22:53 -05: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
b69fa7f2a9
Merge branch '2.0'
2016-02-07 11:54:16 -06:00
metaclassing
4735751bf5
Switched out pack/unpack and ip2long/long2ip with inet_pton/ntop for ipv6 encoding support in x509v3 subject alternative names
2016-01-26 17:23:14 -06:00
Joey3000
bdc28b9453
Cherry-picking cleanup of use
operator usage
...
Picked c9a80ff748
to the 2.0 branch and resolved conflicts.
2016-01-21 19:41:41 +01:00
Joey3000
c9a80ff748
Cleanup of use
operator usage
...
This does the following:
1. Removes superfluous usage of the `use` operator. Specifically, that operator is not needed to use classes in the same `namespace` as the object (see https://secure.php.net/manual/en/language.namespaces.rules.php ).
2. While at it, also sorted the `use` operators alphabetically, for a better overview.
2016-01-18 05:05:31 +01:00
terrafrost
806249c7e9
RSA: changes to how encryption / signatures work
2015-12-25 11:28:24 -06: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
041ece8b6c
Merge branch 'identifier-update-1.0' into 2.0
...
Conflicts:
phpseclib/Net/SSH2.php
2015-12-05 10:30:08 -06:00
terrafrost
37535744b2
small tweaks
2015-11-21 22:55:20 -05:00
terrafrost
efe36d67ce
Merge branch 'master' into rsa-plugins
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-10-22 10:16:52 -05:00
terrafrost
33bf6e42c3
Merge branch '2.0'
2015-10-22 10:14:50 -05:00
terrafrost
96dd14fd6f
Merge branch 'extractber-fix' into extractber-fix-2.0
...
Conflicts:
phpseclib/File/X509.php
2015-10-22 09:56:07 -05:00
terrafrost
46bb95a265
X509: improve base64-encoded detection rules
2015-10-22 09:45:40 -05:00
terrafrost
a9705fdba7
Merge branch 'master' into rsa-plugins
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-10-16 10:01:18 -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
terrafrost
91887c957d
Merge remote-tracking branch 'upstream/master' into rsa-plugins
...
Conflicts:
phpseclib/Crypt/RSA.php
phpseclib/Net/SSH2.php
2015-10-01 15:57:31 -05:00
terrafrost
ec3fe7277b
RSA: move key format handling to plugins
2015-10-01 15:41:11 -05:00
Andreas Fischer
70f55bd156
Merge pull request #825 from terrafrost/rsa-revamp
...
RSA: make createKey static and make it return RSA objects
* terrafrost/rsa-revamp:
RSA: make createKey static and make it return RSA objects
2015-09-25 13:16:56 +02:00
terrafrost
fab5a66fe5
RSA: make createKey static and make it return RSA objects
2015-09-24 09:43:19 -05:00
Andreas Fischer
ccd18552e5
Merge branch '2.0'
...
* 2.0:
Fixed phpdoc
Conflicts:
phpseclib/Crypt/Hash.php
2015-09-16 13:36:04 +02:00
Graham Campbell
7f1bbfe216
Fixed phpdoc
2015-09-14 16:30:31 +01:00
Andreas Fischer
3342eb6d09
Merge branch '2.0'
...
* 2.0:
Fixed another case
Minor tweaks
Fixed error
More fixes
PHPDoc fixes
2015-09-14 01:27:11 +02:00
Andreas Fischer
4387b64426
Merge branch '1.0' into 2.0
...
* 1.0:
Fixed another case
Minor tweaks
Fixed error
More fixes
PHPDoc fixes
Conflicts:
phpseclib/Crypt/Random.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
2015-09-14 01:27:04 +02:00
Graham Campbell
010c1285ba
Fixed another case
2015-09-06 23:05:41 +01:00
Graham Campbell
06a1d3d981
Fixed error
2015-09-06 22:19:34 +01:00
Graham Campbell
dd031a1702
PHPDoc fixes
2015-09-06 12:28:08 +01:00
Andreas Fischer
ed6f754137
Merge pull request #803 from GrahamForks/phpdoc
...
[3.0] PHPDoc Fixes
* GrahamForks/phpdoc:
Fixed lots of phpdoc typos
Fixed invalid param phpdoc
2015-09-02 20:49:05 +02:00
Andreas Fischer
40927a4033
Merge pull request #802 from GrahamForks/2.0-phpdoc
...
[2.0] PHPDoc Fixes
* GrahamForks/2.0-phpdoc:
Fixed lots of phpdoc typos
Fixed invalid param phpdoc
2015-09-02 20:47:45 +02:00
Andreas Fischer
e1bd0dfaf5
Merge pull request #801 from GrahamForks/1.0-phpdoc
...
[1.0] PHPDoc Fixes
* GrahamForks/1.0-phpdoc:
Fixed lots of phpdoc typos
Fixed invalid param phpdoc
2015-09-02 20:43:38 +02:00
Andreas Fischer
19d93fe76c
Merge branch '2.0'
...
* 2.0:
X509: updates to getOID() as suggested by bantu
X509: add getOID() method
2015-09-02 15:06:40 +02:00
Andreas Fischer
9fbc0358bb
Merge branch '1.0' into 2.0
...
* 1.0:
X509: updates to getOID() as suggested by bantu
X509: add getOID() method
2015-09-02 15:06:35 +02: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
Graham Campbell
cd0e10cf9d
Fixed lots of phpdoc typos
2015-09-02 00:37:54 +01:00
Graham Campbell
5890f3da98
Fixed invalid param phpdoc
2015-09-02 00:22:30 +01:00
terrafrost
2a8da097ae
Merge branch 'master' into exceptions-v1
...
Conflicts:
phpseclib/Net/SSH2.php
2015-08-31 23:47:12 -05:00
terrafrost
abbee318cc
X509: updates to getOID() as suggested by bantu
2015-08-31 15:20:38 -05:00
terrafrost
d7d9d782b0
X509: add getOID() method
2015-08-29 22:15:04 -05:00
terrafrost
80d84d1009
ASN1/X509: throw exceptions instead of user_errors
2015-07-30 07:33:19 -05:00
Andreas Fischer
d9e9504fba
Merge branch 'PSR2-1.0' into PSR2-2.0
...
* PSR2-1.0:
Fix indentation phpcbf did not fix.
Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
Use phpcbf to fix PHP code to ruleset.
Ignore coding guidelines in ANSI switch block.
Base code sniffer ruleset on PSR2 rather than PEAR.
Update PHP Code Sniffer to 2.3.3
Conflicts:
build/code-sniffer-ruleset-tests.xml
build/code-sniffer-ruleset.xml
composer.lock
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RSA.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
tests/Unit/Crypt/TwofishTest.php
2015-07-17 13:41:59 +02:00
Andreas Fischer
2013a31ecd
Use phpcbf to fix PHP code to ruleset.
2015-07-17 12:57:41 +02:00
Andreas Fischer
6c76df46d4
Ignore coding guidelines in ANSI switch block.
2015-07-17 12:57:05 +02:00
terrafrost
365c687f04
Merge branch 'x509-serialnumber-1.0' into x509-serialnumber-2.0
...
Conflicts:
phpseclib/File/X509.php
2015-07-17 00:53:45 -05:00
terrafrost
0d3a117608
X509: add a comment to explain the bitmask
2015-07-17 00:45:20 -05:00
terrafrost
ee619e8f47
Merge branch 'x509-serialnumber-1.0' into x509-serialnumber-2.0
...
Conflicts:
phpseclib/File/X509.php
2015-07-16 11:53:15 -05:00
terrafrost
693804e62a
X509: move where Crypt/Random loading is done
2015-07-16 11:50:22 -05:00
terrafrost
374f8db2e3
X509: use a random serial number
2015-07-16 11:31:20 -05:00
Andreas Fischer
483c253879
Merge branch '1.0' into 2.0
...
* 1.0:
X509: set one more parameter to null
X509: set another parameters field to null
2015-06-30 12:27:06 +02:00
terrafrost
77c757d095
X509: set one more parameter to null
2015-06-29 22:10:18 -05:00
terrafrost
6c2798be90
X509: set another parameters field to null
2015-06-29 21:53:27 -05:00
terrafrost
815f443ed1
Merge branch 'x509-rsa-null-1.0' into x509-rsa-null-2.0-2
...
Conflicts:
tests/Unit/File/X509/X509Test.php
2015-06-28 16:10:40 -05:00
terrafrost
46a3c0fbbb
X509: set parameter field to null for RSA keys
2015-06-28 11:32:42 -05:00
Andreas Fischer
ecdd97f8a8
Merge pull request #702 from terrafrost/asn1-fix-2.0
...
ASN1 parsing fix for issue mainly effecting CSR's for 2.0 branch
* terrafrost/asn1-fix-2.0:
Tests/X509: PHP5 adjustments
ASN1: handle malformed input better
Tests/X509/CSR: add unit test for ASN1 changes
ASN1: constructed context-specific tags can have x sub elements
2015-06-16 16:30:46 +02:00
Andreas Fischer
a79b4ac6ad
Merge pull request #699 from terrafrost/asn1-fix-1.0
...
ASN1 parsing fix for issue mainly effecting CSR's for 1.0 branch
* terrafrost/asn1-fix-1.0:
ASN1: handle malformed input better
Tests/X509/CSR: add unit test for ASN1 changes
ASN1: constructed context-specific tags can have x sub elements
2015-06-16 16:30:35 +02:00
terrafrost
22b10c6a3a
Merge branch 'asn1-fix-1.0' into asn1-fix-2.0
2015-06-07 10:24:11 -05:00
terrafrost
11000a93b9
ASN1: handle malformed input better
2015-06-07 09:59:13 -05:00
terrafrost
d3a5398fe4
ASN1: constructed context-specific tags can have x sub elements
...
previously it only worked for when there was one sub element.
2015-06-03 23:48:43 -05:00
terrafrost
649d469c1c
ANSI: use default namespace for stdClass
2015-05-23 21:01:45 -05:00
terrafrost
6c345acc1d
ANSI: PHP5 updates
2015-05-23 18:23:40 -05:00
terrafrost
e4fee53c93
Merge branch 'ansi-updates-1.0' into ansi-updates-2.0
2015-05-23 18:18:22 -05:00
terrafrost
48191bdeec
ANSI: fix typo
2015-05-23 17:39:17 -05:00
terrafrost
2bb70a1c22
ANSI: rendering improvements
2015-05-23 16:51:57 -05:00
terrafrost
cc0420b36b
ANSI: improve vt100 terminal emulation
...
store each coordinate's attributes independently and add support
for a few more escape codes
2015-05-23 11:55:03 -05:00
Andreas Fischer
661f3ce3b9
Merge branch '1.0' into 2.0
...
* 1.0:
Replace ; with : in case statement.
Conflicts:
phpseclib/Net/SFTP.php
phpseclib/Net/SSH2.php
2015-05-03 14:13:56 +02:00
Andreas Fischer
5d2590feb0
Replace ; with : in case statement.
2015-05-03 13:18:23 +02:00
terrafrost
d75f703c0a
rm PHP v4 compatability claim
2015-04-02 05:57:52 -05:00
Andreas Fischer
f57e01df65
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/X509: add unit test
X509: make it so you can use File_ASN1_Element for custom X.509 extensions
2015-03-10 13:46:15 +01:00
terrafrost
7ac2470c98
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into x509-custom-extensions
2015-03-09 01:38:33 -05:00
Andreas Fischer
63ed03b119
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/X509: swap expected and actual value
Tests/X509: fix unit test
Tests/X509: add unit test for unsupported extension encoding
X509: always base64-encode extensions for which _getMapping returns a bool
2015-03-05 15:37:46 +01:00
terrafrost
e686c095b6
X509: always base64-encode extensions for which _getMapping returns a bool
2015-03-01 12:05:49 -06:00
terrafrost
7e2dd90140
X509: make it so you can use File_ASN1_Element for custom X.509 extensions
2015-03-01 11:57:36 -06:00