octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-29 12:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,167 Commits 4 Branches 123 Tags 21 MiB
70a6271d21
Commit Graph

705 Commits

Author SHA1 Message Date
terrafrost
c1d21edb94 Tests/ASN1: add tests for constructed mismatches 2021-04-03 13:44:29 -05:00
terrafrost
104a57badd Merge branch 'moosa-2.0' into moosa-3.0 2021-04-03 13:28:23 -05:00
terrafrost
730070b78f Tests/ASN1: update unit tests to work on 2.0 branch 2021-04-03 13:25:56 -05:00
terrafrost
bac775ecd5 Merge branch 'moosa-1.0' into moosa-2.0 2021-04-03 13:19:15 -05:00
terrafrost
6be326e7e7 Tests/ASN1: add test for OID garbage bytes 2021-04-03 12:04:07 -05:00
terrafrost
2eec2e0ab2 Merge branch 'moosa-1.0' into moosa-2.0 2021-04-03 11:57:40 -05:00
terrafrost
dbd210c4a7 Tests/ASN1: add test for null garbage bytes 2021-04-03 11:38:11 -05:00
terrafrost
72264ff918 Tests/RSA: add unit test for raw keys 2021-02-03 20:00:56 -06:00
terrafrost
3d4767301c X509: fix niche issue with computeKeyIdentifier 2021-01-25 12:17:36 -06:00
terrafrost
6499451d4b Tests/RSA: adjustments for 2.0 2021-01-16 10:40:48 -06:00
terrafrost
8e7acd8842 Merge branch '1.0' into 2.0 2021-01-16 10:32:10 -06:00
Jan Slabon
e5a226f6be Added support of keys with PSS algorithm-identifier 2021-01-16 10:31:56 -06:00
Jan Slabon
131459996b Added support for absent parameters field in PSS keys 
See [here](https://tools.ietf.org/html/rfc4055#section-3.1) for details.
 2021-01-16 10:24:55 -06:00
terrafrost
3e32d5a853
Merge pull request #1573 from kylekatarnls/feature/allow-to-use-extensions 
Allow to extend X509 extensions
 2021-01-15 21:57:07 -06:00
Bastien Miclo
e69049be5e
Add getRegisteredExtension() 2021-01-14 16:15:55 +01:00
terrafrost
6470c492c5
Merge pull request #1574 from kylekatarnls/fix/unit-test-windows-compatibility 
Allow tests to pass even on Windows with git core.autocrlf on
 2021-01-12 10:27:40 -06:00
terrafrost
05d934c89f RSA: improve identification of public / private PKCS1 / PKCS8 keys 2021-01-08 09:01:31 -06:00
terrafrost
010ca94cb4 Merge branch '2.0' into 3.0 2021-01-07 20:36:27 -06:00
terrafrost
78e04f4ab6 Merge branch '1.0' into 2.0 2021-01-07 20:36:21 -06:00
terrafrost
df94788edf Tests/X509: update unit test 2021-01-07 20:36:09 -06:00
terrafrost
d9b8341e9c Merge branch '2.0' into 3.0 2021-01-07 20:24:15 -06:00
terrafrost
649609d4b2 Merge branch '1.0' into 2.0 2021-01-07 20:21:59 -06:00
terrafrost
9de5f3f8ed X509: always parse the first cert of a bundle 2021-01-07 20:21:27 -06:00
Bastien Miclo
619253cdfb
Allow tests to pass even on Windows with git core.autocrlf on 2021-01-07 00:00:26 +01:00
Bastien Miclo
3d35690a0a
Allow to extend X509 extensions 2021-01-06 23:25:23 +01:00
David Prévot
5fd81cff55 ChaCha20 testsuite: tfix (missing quote) 2020-12-30 06:08:09 -06:00
Bastien Miclo
224abbc1f9 Show array-failure in load() method 2020-12-23 07:49:08 -06:00
terrafrost
c5d9534ada fix bad merge 2020-12-13 00:57:30 -06:00
terrafrost
c25dff2ef0 Merge branch '2.0-class-rename' into 3.0-class-rename 2020-12-12 22:26:03 -06:00
terrafrost
360afd93c8 fix bad merge 2020-12-12 22:15:40 -06:00
terrafrost
0676524dfd Merge branch '1.0-class-rename' into 2.0-class-rename 2020-12-12 21:41:10 -06:00
terrafrost
e6abc61f45 rm adding of dupe classes (they break annotations) 2020-12-12 21:39:58 -06:00
terrafrost
1a30cd862f ... 2020-12-12 20:13:42 -06:00
terrafrost
7237c0f803 fix bad merge 2020-12-12 19:34:38 -06:00
terrafrost
e4bf7b111a Merge branch '2.0' into 3.0 2020-12-12 19:22:36 -06:00
terrafrost
95432478c0 fix bad merge 2020-12-12 17:39:32 -06:00
terrafrost
5701295017 Merge branch '1.0' into 2.0 2020-12-12 17:13:41 -06:00
terrafrost
266f16816a enable unit tests for PHP 8 / PHPUnit 9 2020-12-12 15:11:04 -06:00
terrafrost
dd5e7742ea Merge branch '2.0' into 3.0 2020-11-02 19:54:32 -06:00
terrafrost
42b84143e7 Merge branch '1.0' into 2.0 2020-11-02 19:54:25 -06:00
terrafrost
d9196e4a83 X509: fix unit test for multi-cert pems 2020-11-02 19:54:11 -06:00
terrafrost
336fe5c8f8 Merge branch '2.0' into 3.0 2020-10-29 21:46:30 -05:00
terrafrost
a72e0e7456 Tests/X509: update unit test for 2.0 branch 2020-10-29 21:35:59 -05:00
terrafrost
da96fbd212 Merge branch '1.0' into 2.0 2020-10-29 21:35:41 -05:00
terrafrost
00c9edc058 X509: don't attempt to parse multi-cert PEMs 2020-10-29 21:30:01 -05:00
terrafrost
5983df848c EC: add support for PKCS1 private keys with separate parameters 2020-09-19 08:36:09 -05:00
terrafrost
881fbd78ee Hash: add __toString() method 2020-04-19 09:19:27 -05:00
terrafrost
7b5356bf86 RSA: add unit test for public key masquerading as private key 2020-03-29 23:12:52 -05:00
terrafrost
ddd5a08c5f SSH2: update identifier to 3.0 2020-03-07 21:19:00 -06:00
terrafrost
6e55470431 Merge branch '2.0' into 3.0 2020-03-02 10:57:07 -06:00
terrafrost
0cdae704b6 Tests/X509: update unit test for 2.0 2020-03-02 10:34:52 -06:00
terrafrost
6f0e3d22d6 Merge branch '1.0' into 2.0 2020-03-02 10:34:06 -06:00
terrafrost
935fa407e3 ASN1: add unit test for malformed ASN1 strings 2020-03-02 10:03:02 -06:00
terrafrost
db85a95af2 Tests/RSA: add unit test for exceptions 2020-01-19 02:17:43 -06:00
terrafrost
2b28c3814b Keys/PuTTY: better support RFC4716 keys 2020-01-19 02:09:39 -06:00
terrafrost
b65bad4a1d Tests/RSA: add unit test for PuTTY public keys 2020-01-18 21:58:48 -06:00
terrafrost
a485e85ba5 Tests/RSA: add additional assert for MSBLOBs 2020-01-18 17:31:34 -06:00
terrafrost
3ba5902046 RSA / X509: misc fixes (mostly related to PSS) 2020-01-04 16:26:55 -06:00
terrafrost
15c8cc6810 update unit test to account for newly added null byte 2019-12-17 22:01:42 -06:00
terrafrost
fd8389f365 add unit test for phpseclib created PKCS8 Ed25519 private keys 2019-12-17 07:55:36 -06:00
terrafrost
f1d04b23db Merge branch '3.0' into phpseclib3 2019-11-23 01:55:36 -06:00
terrafrost
ea27295c8f SSH2: ssh-ed25519 keys didn't work 2019-11-23 00:58:12 -06:00
terrafrost
653dbd7f94 rename phpseclib/phpseclib to phpseclib/phpseclib3 for 3.0 branch 2019-11-21 19:38:03 -06:00
terrafrost
e7e563d0ce Merge branch '2.0' into 3.0 2019-10-20 13:45:06 -05:00
terrafrost
941230c2df RSA: adustments for 2.0 branch 2019-10-20 13:38:45 -05:00
terrafrost
e36f9388cb Merge branch '1.0' into 2.0 2019-10-20 13:27:24 -05:00
Brice Figureau
207cd0f4ea (#1423) make PSS verification work for non power of 2 keys 
RFC3447 doesn't require RSA public keys to be power of 2 keys.
The actual validation code doesn't work when trying to verify
a PSS signature generated with a non power of two key.
This small patch adds support for such keys.
 2019-10-20 13:27:01 -05:00
terrafrost
666cde2b11 Merge branch '2.0' into 3.0 2019-09-18 08:46:54 -05:00
terrafrost
4027717852 Merge branch '1.0' into 2.0 2019-09-18 08:42:47 -05:00
Remi Collet
17610d105c fix tests for 5.3 2019-09-18 08:03:35 -05:00
terrafrost
45d787a578
Merge pull request #1403 from terrafrost/hmac-additions 
add new HMAC algorithms
 2019-09-16 07:41:54 -05:00
terrafrost
677a15c122 Merge branch '2.0' 2019-09-15 17:31:53 -05:00
terrafrost
bd6dbd0695 Merge branch '1.0' into 2.0 2019-09-15 17:20:11 -05:00
terrafrost
11fea7d004 fix bug with toBytes() with fixed precision negative numbers 2019-09-15 17:19:35 -05:00
terrafrost
8608463d61 Hash: add support for UMACs 2019-09-07 14:46:55 -05:00
terrafrost
422523cf43 EC: make libsodium an insvisible key format 2019-08-09 09:19:01 -05:00
terrafrost
68f3d7d8af add support for Curve448 2019-08-08 22:38:42 -05:00
terrafrost
7cf5facae7 DH: add Curve25519 unit test based off of RFC7748 test vectors 2019-08-08 08:00:37 -05:00
terrafrost
f04d69a3eb Merge branch 'master' into diffie-hellman 2019-08-07 08:09:36 -05:00
terrafrost
1e7453b585 add a new diffie-hellman key exchange class 2019-08-06 22:10:56 -05:00
terrafrost
2286c834bd Merge branch '2.0' 2019-08-02 23:41:40 -05:00
terrafrost
d51b07597a Merge branch '1.0' into 2.0 2019-08-02 22:55:22 -05:00
terrafrost
511f55de3d X509: fix issue with explicit time tags whose maps expect implicit 2019-08-02 22:00:33 -05:00
terrafrost
de8903d2f2 Merge branch '2.0' 2019-07-30 21:06:22 -05:00
terrafrost
e26fcce1f4 Merge branch '1.0' into 2.0 2019-07-30 08:07:51 -05:00
terrafrost
19ad5d27da X509: ips in nameconstraints ext include netmask 2019-07-30 07:37:16 -05:00
terrafrost
289ae55f9f rename ECDSA -> EC 2019-06-27 23:15:25 -05:00
terrafrost
7012e72488 mv Keys/ and Signature/ to Formats/* 2019-06-25 07:52:45 -05:00
terrafrost
d7abfaadbc X509: rm $signatureAlgorithm parameter from signature methods 2019-06-24 18:24:14 -05:00
terrafrost
84b852933e Merge branch '2.0' 2019-06-19 22:36:18 -05:00
terrafrost
d2085db7b7 Merge branch '1.0' into 2.0 2019-06-19 22:34:11 -05:00
terrafrost
d0014cbb20 Tests/BigInteger: add two more divide tests 2019-06-19 22:21:24 -05:00
terrafrost
0e449e8b17 X509: add support for id-RSASSA-PSS 2019-06-15 10:46:34 -05:00
terrafrost
6cf05541cc Merge branch '1.0' into 2.0 2019-06-09 23:46:46 -05:00
terrafrost
cd7de5723c RSA: add support for OpenSSH private keys 2019-06-09 23:42:41 -05:00
terrafrost
327f555b7c add expanded support for OpenSSH private keys 2019-06-08 22:04:54 -05:00
terrafrost
8e03f5bfb2 RSA: make it so PSS keys can be saved 2019-06-01 19:35:17 -05:00
terrafrost
8017c74429 RSA: add preliminary support for RSA-PSS keys 2019-05-29 00:32:53 -05:00
terrafrost
89e41233e0 fix bad merge 2019-05-26 22:56:20 -05:00
terrafrost
337b41f865 Merge branch 'master' into immutable-keys 2019-05-26 22:51:40 -05:00
terrafrost
3ca5b88d58 Merge branch '1.0' into 2.0 2019-05-26 15:38:34 -05:00
terrafrost
677ae387b0 BigInteger: backport GMP fixes from master branch 2019-05-26 15:38:18 -05:00
terrafrost
50d6c8aafd Tests/BigInteger: test for new BigInteger('-0') 2019-05-26 15:21:27 -05:00
terrafrost
fae6542efc Merge branch '1.0' into 2.0 2019-05-26 12:17:27 -05:00
terrafrost
ade48c2cb1 Tests/BigInteger: GMP engine didn't always return 1 or -1 2019-05-26 12:13:54 -05:00
terrafrost
63f8276693 Merge branch '2.0' 2019-05-26 11:43:14 -05:00
terrafrost
77ffe153a0 Merge branch '1.0' into 2.0 2019-05-26 11:42:01 -05:00
terrafrost
e9d99a6683 Tests/BigInteger: add unit test for 0 loaded as base-10 2019-05-26 11:41:41 -05:00
terrafrost
7c270b9db3 Merge branch '2.0' 2019-05-26 10:29:34 -05:00
terrafrost
6fa2174fff Tests/X509: update unit test to work on 2.0 2019-05-26 10:29:15 -05:00
terrafrost
7d4b724749 Merge branch '1.0' into 2.0 2019-05-26 10:28:50 -05:00
terrafrost
9e31808f61 Tests/X509: fix for last unit test 2019-05-26 10:28:21 -05:00
terrafrost
3d7acde183 Tests/X509: add unit test for long tags 2019-05-26 03:10:43 -05:00
terrafrost
c839297065 Tests/BigInteger: GMP engine didn't always return 1 or -1 2019-05-24 08:25:52 -05:00
terrafrost
7c7d500d80 System/Agent: add support for DSA / ECDSA keys 2019-05-23 08:35:36 -05:00
terrafrost
7d3b5a0c79 Tests/X509: add new tests to test DSA / ECDSA certs 2019-05-20 23:38:54 -05:00
terrafrost
cc32cd2e95 make RSA / DSA / ECDSA immutable and add support to SSH2 / X509 2019-05-19 15:35:29 -05:00
terrafrost
b09bc1883e Merge branch 'oid-revamp-2.0' 2019-05-02 07:28:27 -05:00
terrafrost
98cbccc81a Merge branch 'oid-revamp' into oid-revamp-2.0 2019-05-02 07:18:37 -05:00
terrafrost
e793461543 ASN1: revamp how OIDs are handled 2019-05-01 09:17:53 -05:00
terrafrost
00b6eaf507 ECDSA/Keys/PKCS8: correctly convert private keys to public 2019-04-29 21:45:17 -05:00
terrafrost
e0cbd3fe78 Tests/BigInteger: update unit test 2019-04-10 08:24:24 -05:00
terrafrost
c9d4a89267 rm SSH1 2019-03-29 21:51:26 -05:00
terrafrost
494d20efc8 add Salsa20 / ChaCha20 stream ciphers 2019-03-22 15:45:36 -05:00
terrafrost
17e6938fba updates to Exceptions 2018-12-31 09:55:32 -06:00
terrafrost
01c92a59f8 add support for Galois/Counter Mode (GCM) 2018-12-27 08:31:35 -06:00
terrafrost
3dbc50c667 Merge branch 'post-ecdsa' 2018-12-16 19:03:44 -06:00
terrafrost
50f9e1a71a Tests/AES: add unit test for encrypting without a key 2018-12-02 11:58:07 -06:00
terrafrost
d234297819 Tests/ECDSA: test to make sure that k is not re-used 2018-11-24 22:13:40 -06:00
terrafrost
3c4fbe131f Tests/ECDSA: make tests work on PHP 5.6 (by skipping some tests) 2018-11-24 08:32:14 -06:00
terrafrost
e1961c598d Merge branch '2.0' 2018-11-22 13:33:35 -06:00
terrafrost
ec7454dd78 Tests/X509: update test for 2.0 2018-11-22 13:23:02 -06:00
terrafrost
0cb026f5a2 Merge branch '1.0' into 2.0 2018-11-22 12:50:04 -06:00
terrafrost
431b3570fa Tests/X509: add validatedate unit test 2018-11-22 12:40:32 -06:00
terrafrost
0398f7a815 add ECDSA / EdDSA support 2018-11-19 12:39:21 -06:00
terrafrost
4bc53f1251 Merge branch '2.0' 2018-09-17 00:29:24 -05:00
terrafrost
32ce6a0d3e Tests/ASN1: update unit test to work on 2.0 2018-09-17 00:27:42 -05:00
terrafrost
48aa55b7f6 Merge branch '1.0' into 2.0 2018-09-17 00:27:25 -05:00
Michiel Brandenburg
b4e66d343e Fixes #1296 parsing invalid certificate 2018-09-17 00:25:55 -05:00
terrafrost
7740d9c0c0 Hash: add sha3 support 2018-08-11 23:55:41 -05:00
terrafrost
28b26b50df Merge branch '2.0' 2018-04-15 10:31:12 -05:00
terrafrost
bbc651f0b6 Merge branch '1.0' into 2.0 2018-04-15 10:27:46 -05:00
terrafrost
7fc3cf69f8 Tests/ASN1: add test for commit 6dc7b3e 2018-04-15 08:30:02 -05:00
terrafrost
ab270d1602 Merge branch '2.0' 2018-04-10 00:19:49 -05:00
terrafrost
4548b45b9e Merge branch '1.0' into 2.0 2018-04-09 23:57:25 -05:00
terrafrost
48e50fe8fa Tests/BigInteger: add test for conversion of 48 to signed hex 2018-04-09 23:36:36 -05:00
terrafrost
d4b0e00d14 Tests/BigInteger: make sure that zero is represented uniformly 2018-04-03 20:19:14 -05:00
Jakob Gahde
8e6948fdd2
Backport CFB8 support from master 2018-03-27 04:32:16 +02:00
terrafrost
6c4a108a92 Merge branch 'authority-info-access-2.0' into authority-info-access-master 2018-03-03 08:09:26 -06:00
terrafrost
40730d2977 X509: update intermediate cert changes to work on 2.0 branch 2018-03-03 07:46:03 -06:00
terrafrost
87decbe94b Merge branch 'authority-info-access-1.0' into authority-info-access-2.0 2018-03-03 00:15:29 -06:00
terrafrost
4438336d44 Tests/X509: add unit test for itermediate cert additions 2018-03-02 13:15:46 -06:00
terrafrost
2440be341d Tests/AES: add test for ECB mode 2018-02-21 08:20:29 -06:00
terrafrost
55384afdac RSA: make it so you can't sign w/ public key, decrypt w/ private 2018-02-18 16:03:06 -06:00
terrafrost
44ac8f3996 Merge branch '2.0' 2018-01-22 07:26:57 -06:00
terrafrost
364e05babf Merge branch '1.0' into 2.0 2018-01-22 07:22:29 -06:00
terrafrost
8879fa0018 Tests/BigInteger: add bitwise_xor test 2018-01-22 00:18:55 -06:00
terrafrost
739d826a16 Tests/X509: update for master branch 2018-01-21 13:01:24 -06:00
terrafrost
fe71957c37 Merge branch '2.0' 2018-01-21 13:01:06 -06:00
terrafrost
bb3798c731 Tests/X509: update tests for 2.0 branch 2018-01-21 12:39:38 -06:00
terrafrost
c419f1121f Merge branch '1.0' into 2.0 2018-01-21 12:38:35 -06:00
terrafrost
c8829e7865 Tests/X509: add unit test for #1243 2018-01-21 12:14:08 -06:00
terrafrost
eefcf9c941 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2017-12-14 22:49:47 -06:00
terrafrost
a5ed1acbae Merge branch '2.0' 2017-12-14 06:34:43 -06:00
terrafrost
446652099a Merge branch 'validation-1.0' into 2.0 2017-12-13 19:50:37 -06:00
terrafrost
340deffc98 Tests/X509: update tests to work with #1213 in 1.0 2017-12-13 19:23:12 -06:00
mdelikat
d9195ea5bd validateSignature if subjectKeyIdentifier is not set and check serial number if is set 2017-12-13 19:05:06 -06:00
Gabriel Caruso
8eb7f3a798 Refactoring tests 2017-12-07 18:08:19 -02:00
Sokolovskyy Roman
966ee7f170 Long array() to short [] syntax 2017-11-27 09:30:14 +01:00
terrafrost
1041131bb1 Merge branch '2.0' 2017-11-05 11:53:59 -06:00
terrafrost
12090c138e Tests/X509: update 1.0 test to work on 2.0 2017-11-05 11:42:33 -06:00
terrafrost
d218020747 Merge branch '1.0' into 2.0 2017-11-05 11:42:08 -06:00
terrafrost
ffcff461c4 X509: URL validation didn't work (#1203) 2017-11-05 11:36:41 -06:00
terrafrost
5e9c67b2d0 Tests/BigInteger: re-enable primality testing in 32-bit PHP7 2017-11-04 09:42:15 -05:00
terrafrost
a5038e2fd9 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2017-10-24 07:48:24 -05:00
terrafrost
cdeeba9ecd Tests/BigInteger: randomPrime(128) on PHP32 is just too slow 2017-10-24 00:50:48 -05:00
terrafrost
a59d046c9d Tests/BigInteger: add unit test for randomPrime 2017-10-21 12:25:13 -05:00
Takuya Sawada
18a5867e16 Tests/AES: add newly added 'cfb8' cipher mode of operation for unit test 2017-10-05 19:06:50 +09:00
terrafrost
256ffcca7b Merge remote-tracking branch 'pcf0/fix-biginteger-badconfigurationexception' 2017-10-01 07:53:54 +01:00
terrafrost
4f2ece4d7d Merge remote-tracking branch 'rrran/Bugfixes2' 2017-09-30 22:50:06 +01:00
PCF
d71b6ae3e7
fixup! TestCase for BadConfigurationException in BigInteger 2017-09-30 13:44:37 +02:00
PCF
e598a027b8
fixup! TestCase for BadConfigurationException in BigInteger 2017-09-30 03:23:39 +02:00
PCF
c12ffe0b37
TestCase for BadConfigurationException in BigInteger 2017-09-30 02:46:49 +02:00
terrafrost
fc6a97083c Merge branch '2.0' 2017-09-29 21:34:51 +01:00
Martijn Smit
b3add4491d Replace extension_loaded with forward compatible function exists check 2017-09-29 21:33:57 +01:00
Sokolovskyy Roman
c6020a4c42 Unit tests fixes. 
A PHPDoc fix
 2017-09-14 09:42:37 +02:00
Sokolovskyy Roman
25c1ae6e00 Merge remote-tracking branch 'origin/master' into Bugfixes2 2017-08-09 12:28:02 +02:00
terrafrost
04fce0b39b Merge branch '2.0' 2017-08-08 22:04:59 -05:00
terrafrost
a9cd28d8fd Tests/ANSI: update test for 2.0 branch 2017-08-08 21:53:37 -05:00
terrafrost
a4c79db37a Merge branch '1.0' into 2.0 2017-08-08 21:53:07 -05:00
terrafrost
89188ec570 Tests/ANSI: add test for #1161 E_NOTICE in ANSI 2017-08-08 21:35:48 -05:00
terrafrost
9d8f014748 SymmetricKey: isValidKey took ints instead of strings 2017-08-07 23:57:02 -05:00
terrafrost
ce5eb7e1c9 Tests/X509/CRLTest: fix path for crl.bin 2017-08-07 22:35:29 -05:00
terrafrost
bd489a16dc Tests/X509: add CRL test 2017-08-06 12:35:52 -05:00
terrafrost
135a4decf1 Tests/X509: add setEndDate 2017-08-06 10:49:03 -05:00
Sokolovskyy Roman
55cacdf7cd More PHPDOC fixes 2017-08-04 12:06:25 +02:00
terrafrost
885dc96185 Tests/DSA: expand test to reproduce issue identified in #1151 2017-07-30 15:57:53 -05:00
terrafrost
0b34a8e543 Tests/ASN1: add additional unit test inspired by #1151 2017-07-30 11:24:58 -05:00
terrafrost
2b80803042 Merge branch '2.0' 2017-07-16 12:10:37 -05:00
terrafrost
ce2bfd984e Tests: fix CS errors 2017-07-16 12:09:45 -05:00