terrafrost
b64952680e
Merge branch '3.0'
2022-08-20 17:38:19 -05:00
terrafrost
0b3c6e27fc
add JSON Web Key (JWK) support
2022-08-20 17:38:12 -05:00
terrafrost
a01c3915ce
Merge branch '3.0'
2022-08-20 06:19:24 -05:00
terrafrost
13b241e3e9
use libsodium's hex (en|de)coding if available
2022-08-19 22:49:26 -05:00
terrafrost
3c73d61e7e
Merge branch '3.0'
2022-08-19 09:22:57 -05:00
terrafrost
e5396968c5
use libsodium's base64 decoding if available
2022-08-19 09:11:46 -05:00
Jack Worman
16ade5d634
Quality tool fixes
2022-08-18 08:25:29 -05:00
Jack Worman
a8f30f516a
Throw exception instead of triggering error, and added base exception interface
2022-08-18 08:10:12 -05:00
Jack Worman
3f3de53503
Use loop for encrypting $p
2022-08-18 08:10:12 -05:00
Jack Worman
6958ba1627
php-cs-fixer @PHP81Migration rule set
2022-08-18 08:10:12 -05:00
Jack Worman
80f2d7f521
php-cs-fixer - php 7.4 rules
2022-08-18 08:10:08 -05:00
terrafrost
0e4e513900
Merge branch '3.0'
2022-08-17 00:08:21 -05:00
terrafrost
ea94a73380
Merge branch '2.0' into 3.0
2022-08-17 00:08:15 -05:00
terrafrost
cf6ff7dad0
Merge branch '1.0' into 2.0
2022-08-17 00:08:08 -05:00
terrafrost
3d05201d40
X509: include the query part of the URL
2022-08-17 00:07:54 -05:00
terrafrost
9e7efc914d
fix bad merge
2022-08-16 19:38:23 -05:00
terrafrost
fd6e53719c
Merge branch '3.0'
2022-08-16 19:32:51 -05:00
terrafrost
e78edac015
Merge branch '3.0-logging-enhancements' into 3.0
2022-08-16 19:19:40 -05:00
terrafrost
32e85c2145
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2022-08-13 16:52:58 -05:00
terrafrost
1d04f9b1d4
Merge branch 'callmejon'
2022-08-13 09:05:30 -05:00
terrafrost
f928536632
EC: make secret field in savePrivateKey optional
2022-08-12 13:12:16 -05:00
walkonthemarz
871f37087d
Revert back the commit 85205bf6d5
2022-08-12 16:42:11 +08:00
Jonny Fonsato
5c8966334e
removed initialization where not needed
2022-08-02 11:50:12 +02:00
Jonny Fonsato
05cdd09f52
add --ignore-platform-req=php for fix test error
2022-08-02 11:06:37 +02:00
terrafrost
259f44207a
Merge pull request #1824 from jack-worman/Php_7.3
...
Php 7.3 php-cs-fixer rule and composer.json scripts
2022-07-31 23:43:07 -05:00
terrafrost
652e84934d
Merge pull request #1823 from jack-worman/Re-add_old_x
...
Re-add_old_x
2022-07-31 23:27:51 -05:00
terrafrost
92984a318f
Merge branch '3.0'
2022-07-31 19:35:05 -05:00
terrafrost
7fbd6d5fef
Merge branch '2.0' into 3.0
2022-07-31 19:34:49 -05:00
terrafrost
3a087da5cc
Merge branch '1.0' into 2.0
2022-07-31 19:34:42 -05:00
terrafrost
a44b56d4b5
Crypt/Base: fix PHP 8.2 deprecation error
2022-07-31 19:29:31 -05:00
terrafrost
2e549e3aa1
Merge branch '3.0'
2022-07-31 17:28:30 -05:00
terrafrost
826d8d6670
make it so OpenSSH encrypted keys can be created
2022-07-31 17:14:20 -05:00
terrafrost
e95febd5aa
rm safe_intval
2022-07-31 16:03:41 -05:00
terrafrost
e54624c085
CS adjustments
2022-07-31 09:31:41 -05:00
terrafrost
af7a69a66f
Merge branch 'bcrypt' into bcrypt2
2022-07-31 09:04:54 -05:00
terrafrost
2d6713cd54
Crypt: CRYPT_BASE_USE_SAFE_INTVAL -> CRYPT_BASE_USE_REG_INTVAL
2022-07-31 08:59:21 -05:00
terrafrost
3691aefd2b
CS adjustments
2022-07-31 08:48:04 -05:00
terrafrost
69d3f8548a
Merge branch 'bcrypt3'
2022-07-30 19:49:05 -05:00
terrafrost
1e10a6ab7a
fix bad merge
2022-07-30 18:51:45 -05:00
terrafrost
450a961785
Merge branch 'bcrypt2' into bcrypt3
2022-07-30 18:07:26 -05:00
terrafrost
abb6a62384
fix bad merge
2022-07-28 17:35:12 -05:00
terrafrost
11977eeb3c
Merge branch 'bcrypt' into bcrypt2
2022-07-28 16:55:43 -05:00
terrafrost
34a277ff16
a few small tweaks
2022-07-28 16:44:29 -05:00
Jonny Fonsato
dd86bd9fbd
change secret position after rebase
2022-07-28 16:56:00 +02:00
Jonny Fonsato
5411695c0b
changed as mentioned by Terrafrost
2022-07-28 16:38:51 +02:00
Jonny Fonsato
a3ce8392fd
I have upgraded to php 8.2 with the tests running successfully
2022-07-28 16:30:54 +02:00
terrafrost
cd716bcf36
updates to make phpseclib 1.0 work on older PHP versions
2022-07-28 08:42:14 -05:00
terrafrost
0c8994bbad
Crypt/RSA: add support for loading OpenSSH encrypted keys
2022-07-28 08:11:42 -05:00
terrafrost
76a7b07bda
Crypt/Blowfish: partial refactor for bcrypt
2022-07-24 17:37:31 -05:00
terrafrost
445077e733
Crypt/Base: rewrite how safe_intval check is done
2022-07-24 16:51:56 -05:00
terrafrost
b0e034ff9d
Merge branch '3.0'
2022-07-23 09:41:56 -05:00
terrafrost
33b8a299b5
SymmetricKey: CS update
2022-07-23 09:39:33 -05:00
terrafrost
0ab44df4ce
Merge branch '3.0'
2022-07-23 09:35:02 -05:00
terrafrost
cd5a38ef3b
Merge branch '2.0' into 3.0
2022-07-23 09:32:44 -05:00
terrafrost
d22110b057
Crypt/Base: rm php <= 5.3.0 code
2022-07-23 09:31:42 -05:00
terrafrost
a7a39624b0
Merge branch '1.0' into 2.0
2022-07-23 09:28:21 -05:00
terrafrost
ccbb116db3
Crypt/Base: limit conditions under which safe_intval is used
2022-07-23 09:22:00 -05:00
Jack Worman
510a93a50a
Php 7.3
...
- Update php requirement to >=7.3
- Add php-cs-fixer rule: @PHP73Migration
2022-07-22 21:45:53 -05:00
Jack Worman
5f4c89b688
Re-add_old_x
2022-07-22 21:16:51 -05:00
terrafrost
a699dadb03
tweak comments
2022-07-22 19:16:04 -05:00
terrafrost
a95abeb4c4
Merge remote-tracking branch 'jworman/Php_7.1'
2022-07-22 18:29:53 -05:00
terrafrost
5e524c3f21
Merge branch '3.0'
2022-07-16 09:16:37 -05:00
terrafrost
114f8c8f77
backport more changes from master
2022-07-16 09:03:17 -05:00
terrafrost
57031bdf9a
Merge branch '3.0'
2022-07-15 15:32:05 -05:00
Anthony Ryan
dd9146e259
Fix return type comment on Crypt/RSA::createKey()
...
Function returns a Crypt/RSA/PrivateKey and updating
the PHPDoc for it will help with static analysis.
2022-07-15 15:30:47 -05:00
terrafrost
35be18b292
Merge branch '3.0'
2022-07-15 12:29:19 -05:00
terrafrost
c73b9f0884
RSA/XML: rm redundant check
2022-07-15 12:28:56 -05:00
terrafrost
a9c3f10de4
Merge branch '3.0'
2022-07-15 09:18:37 -05:00
terrafrost
feced404bb
EC/PKCS8: OpenSSL didn't like phpseclib formed Ed25519 public keys
2022-07-15 09:18:15 -05:00
terrafrost
7aa6c08a85
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2022-07-14 23:16:14 -05:00
terrafrost
4914e91a33
Merge branch '3.0'
2022-07-14 23:05:51 -05:00
terrafrost
1359431224
Merge branch '1.0' into 2.0
2022-07-14 23:04:58 -05:00
terrafrost
22e2fdbca6
Merge branch '2.0' into 3.0
2022-07-13 09:14:05 -05:00
terrafrost
68323d8f11
Merge branch '1.0' into 2.0
2022-07-13 09:07:31 -05:00
terrafrost
9fae7ec89d
RSA: loading keys could error out if xml extension wasn't installed
2022-07-13 09:06:33 -05:00
Jack Worman
7154fd98d2
Php 7.1
2022-07-08 21:42:28 -05:00
Jack Worman
e210166f43
Php 7.1 Upgrade
2022-07-08 08:37:58 -05:00
terrafrost
477b98d43d
SSH2 / SFTP: unify logging and add a new mode - LOG_SIMPLE_REALTIME
2022-07-06 21:22:03 -05:00
Jack Worman
b2beedbf9a
3rd round of comments
2022-07-03 07:54:11 -05:00
Jack Worman
81ffdbc4ef
Merge branch 'master' into Upgrade_to_Php_7.0
...
# Conflicts:
# phpseclib/Crypt/EC/BaseCurves/Prime.php
# phpseclib/Crypt/EC/Formats/Keys/XML.php
# phpseclib/Crypt/RSA/PrivateKey.php
# phpseclib/File/ANSI.php
# phpseclib/File/ASN1.php
# phpseclib/File/X509.php
# phpseclib/Net/SFTP.php
# phpseclib/Net/SFTP/Stream.php
# phpseclib/Net/SSH2.php
# phpseclib/System/SSH/Agent.php
# phpseclib/System/SSH/Agent/Identity.php
# tests/Unit/Math/BigInteger/TestCase.php
2022-07-03 07:48:16 -05:00
Jack Worman
8a2b94fb24
3rd round of comments
2022-07-03 07:33:45 -05:00
terrafrost
30e845ff1a
Merge branch '3.0'
2022-07-02 21:50:18 -05:00
terrafrost
1fd995abdf
Merge branch '3.0-type-hinting-backport' into 3.0
2022-07-02 21:49:55 -05:00
terrafrost
250f1a5b51
more backporting
2022-07-02 21:49:45 -05:00
Jack Worman
86ef8ef262
2nd round of comments
2022-07-02 16:47:49 -05:00
Jack Worman
beafe2a8a1
1st round of comments
2022-07-02 16:26:17 -05:00
Jack Worman
97902d4bd3
Upgrade to PHP 7.0
2022-07-02 16:26:15 -05:00
terrafrost
d22639841a
Merge branch '3.0'
2022-06-26 17:08:07 -05:00
terrafrost
0b3cc98084
BigInteger: fix behavior on 32-bit PHP installs
2022-06-26 17:07:45 -05:00
terrafrost
2f9bfb7987
Merge branch '1.0' into 2.0
2022-06-22 08:17:22 -05:00
terrafrost
978b2adbfc
RC2: fix deprecation error
2022-06-22 08:17:09 -05:00
terrafrost
4bceb6ca2d
Merge branch '1.0' into 2.0
2022-06-22 08:01:36 -05:00
terrafrost
f61a9b42d5
don't use dynamic properties, which are deprecated in PHP 8.2
2022-06-22 08:00:59 -05:00
terrafrost
9141c92236
RSA/PublicKey: rm bad type hint
2022-06-22 07:18:36 -05:00
terrafrost
7de44b745d
X509: backport fix for dnsName to 3.0 branch from master
2022-06-21 08:17:59 -05:00
Vadym Ovechkin
cee667126c
Prevent static call to non-static method error ( #1805 )
2022-06-20 21:27:10 +03:00
terrafrost
9a1d16fe97
ASN1: make it so that null is returned if the BER can't be decoded
2022-06-18 22:51:31 -05:00
terrafrost
e0adfa1712
backport select type hinting changes from master branch
2022-06-18 17:42:01 -05:00
terrafrost
545b43cd70
Merge branch '3.0'
2022-06-16 17:57:28 -05:00
terrafrost
f24691dc55
Merge branch '2.0' into 3.0
2022-06-16 09:37:40 -05:00
terrafrost
a0c76f01d2
Merge branch '1.0' into 2.0
2022-06-16 08:32:59 -05:00
terrafrost
f189b9aae2
SFTP: try without path canonicalization if initial realpath() fails
...
also make it so chdir works even without path canonicalization
2022-06-16 08:31:39 -05:00
terrafrost
c4f6f602e5
SFTP: update for the master branch
2022-06-14 05:47:51 -05:00
terrafrost
a84f5ddc49
Merge branch '3.0'
2022-06-14 05:47:13 -05:00
terrafrost
623bb39f1c
SFTP: update for 3.0 branch
...
in 1.0 / 2.0 _get_channel_packet could return false even when the
channel status was NET_SSH2_MSG_CHANNEL_DATA. in 3.0 it can't.
where 1.0 / 2.0 returned false 3.0 now throws exceptions
2022-06-14 05:43:31 -05:00
terrafrost
d85417c6ec
Merge branch '2.0' into 3.0
2022-06-14 05:42:25 -05:00
terrafrost
413dcb6082
SFTP: update for 2.0 code
2022-06-14 05:32:38 -05:00
terrafrost
1d1d3a4403
Merge branch '1.0' into 2.0
2022-06-14 05:31:09 -05:00
terrafrost
85205bf6d5
SSH2: set channel closure flag elsewhere as well
2022-06-14 05:30:24 -05:00
terrafrost
dcf9656a42
Merge branch '3.0'
2022-06-14 03:58:42 -05:00
terrafrost
9c45309d0e
SSH2: CS adjustment
2022-06-14 03:58:31 -05:00
terrafrost
0ca4393a2a
Merge branch '3.0'
2022-06-14 00:03:20 -05:00
terrafrost
fbf6027a43
Merge branch '2.0' into 3.0
2022-06-14 00:03:13 -05:00
terrafrost
5ea851d68b
Merge branch '1.0' into 2.0
2022-06-14 00:02:23 -05:00
terrafrost
62677de0bf
SSH2: fix possibly undefined variable error
2022-06-14 00:02:10 -05:00
terrafrost
62c36daa67
Merge branch '3.0'
2022-05-13 15:04:33 -05:00
Filippo Tessarotto
8b13462ee8
SFTP::get can also return true
2022-05-11 11:53:42 +02:00
terrafrost
0446caf2f6
Merge branch '3.0'
2022-05-10 22:14:16 -05:00
terrafrost
43c59198b8
Merge branch '2.0' into 3.0
2022-05-10 22:14:10 -05:00
terrafrost
3286f095d2
Merge branch '1.0' into 2.0
2022-05-10 22:14:04 -05:00
Yan Hu
eb71a6da75
Detect if stream metadata has wrapper_type set for SFTP put() method
2022-05-10 22:13:52 -05:00
terrafrost
c11618f005
Merge branch '3.0'
2022-05-06 16:25:37 -05:00
terrafrost
15ad047415
replace git.io links
2022-05-06 16:25:22 -05:00
terrafrost
51f863f289
Merge branch '3.0'
2022-05-06 14:27:24 -05:00
terrafrost
715bb9ff97
SFTP: CS adjustment
2022-05-06 14:26:57 -05:00
terrafrost
571e16af38
Merge branch '2.0' into 3.0
2022-05-06 14:26:30 -05:00
terrafrost
10a011de1d
Merge branch '1.0' into 2.0
2022-05-06 14:26:24 -05:00
terrafrost
1dfd1b9cd4
SFTP: try to delete dir even if it can't be opened
2022-05-06 14:19:42 -05:00
terrafrost
21993760ad
Merge branch '3.0'
2022-05-04 07:09:00 -05:00
terrafrost
3ce5d6f8c7
ASN1\Maps: CS adjustments
2022-05-04 07:03:47 -05:00
Jack Worman
8855351cbb
Remove_@access
2022-05-04 01:35:56 -05:00
terrafrost
f21681bee8
Merge branch '3.0'
2022-05-04 01:19:12 -05:00
terrafrost
a965060d81
SSH2: make login method return false under rare situation
2022-05-04 01:18:33 -05:00
terrafrost
eabe4aa23f
Merge branch '1.0' into 2.0
2022-04-26 09:02:46 -05:00
terrafrost
c22bf62ce1
BigInteger: tweak to the phpinfo checks
2022-04-26 08:54:19 -05:00
terrafrost
f57f5debe0
Merge branch '3.0'
2022-04-14 11:50:40 -05:00
terrafrost
e700ac7561
SFTP: fix enableDatePreservation bug w.r.t. mtime
2022-04-14 11:48:49 -05:00
terrafrost
726264bafa
Merge branch '3.0'
2022-03-20 13:52:26 -05:00
terrafrost
9a1e1caa90
EC / DSA: useBestEngine() needs to be called in getEngine()
2022-03-20 13:52:00 -05:00
terrafrost
ed0f7cc9f6
Merge branch '3.0'
2022-03-20 11:30:52 -05:00
terrafrost
301aad4764
RSA: conditionally call useBestEngine() when getEngine() is called
2022-03-20 11:30:24 -05:00
terrafrost
19502c5070
Merge branch '3.0'
2022-03-18 12:47:49 -05:00
terrafrost
eb971aaaac
BigInteger: fix deprecation notice
2022-03-18 12:47:40 -05:00
terrafrost
bf71ed9618
Merge branch '1.0' into 2.0
2022-03-18 11:13:26 -05:00
terrafrost
24ae493c10
Crypt/Base: fix deprecation notice
2022-03-18 11:05:49 -05:00
terrafrost
3e073a59e0
Merge branch '3.0'
2022-03-15 18:56:04 -05:00
Jack Worman
0a69972571
Clean Up Tests
2022-03-15 18:49:38 -05:00
terrafrost
57ad98e8bb
Merge branch '3.0'
2022-03-12 21:15:36 -06:00
terrafrost
887cf97185
fix pslam error
2022-03-11 19:14:07 -06:00
terrafrost
f04a4e6fda
fix error in PHP EvalBarrett Engine:
2022-03-11 18:38:01 -06:00
terrafrost
26d8f7a250
make it so BigIntegers can be JSON serialized
2022-03-10 20:26:46 -06:00
terrafrost
815aa23b39
BigInteger/Engines/BCMath: bcmod got a third param in PHP 7.2.0
...
the third parameter also isn't set in any other bcmod call and
isn't needed for bccomp anyway as
bccomp('0.000', '0') == bccomp('0', '0')
2022-03-10 05:24:30 -06:00
terrafrost
2f57517bad
BigInteger/Engines/PHP: trim 0's when a precision is being used
2022-03-08 23:37:29 -06:00
terrafrost
1c35df08dc
Merge branch '3.0'
2022-03-08 20:53:33 -06:00
terrafrost
824b232b47
BigInteger: add precision to __debugInfo
2022-03-08 20:53:18 -06:00
terrafrost
963fd7368f
Merge branch '3.0'
2022-03-03 17:49:36 -06:00
terrafrost
04e46cf656
CS adjustment
2022-03-03 17:44:41 -06:00
Jack Worman
9e321981a2
Psalm coverage for phpseclib3\Math\
...
Revert accidental change
2022-03-03 17:40:20 -06:00
Jack Worman
6bad45c016
Psalm coverage for phpseclib3\Math\
2022-03-03 17:37:26 -06:00
Jack Worman
b6f93a4a21
Psalm coverage for phpseclib3\Math\
...
Psalm coverage for phpseclib3\Math\
2022-03-03 17:36:10 -06:00
Jack Worman
6f2db49696
Psalm coverage for phpseclib3\Math\
...
Psalm coverage for phpseclib3\Math\
2022-03-03 17:20:24 -06:00
terrafrost
95aec3267d
CS tweaks (Ssh -> SSH, Sftp -> SFTP)
2022-02-27 02:17:25 -06:00
terrafrost
6a6e80ba8f
Merge branch '3.0'
2022-02-27 01:40:25 -06:00
Jack Worman
574953061a
PSR4 for tests and added fall-through for switches
...
PSR4 for tests and added fall-through for switches
2022-02-27 01:26:31 -06:00
terrafrost
120cdfb6e3
Merge branch '3.0'
2022-02-27 00:37:14 -06:00
terrafrost
5f60f96487
File/ASN1/Maps: CS adjustments
...
these are mostly backported from PR#1754. the only modified files
from that PR are:
- RSAPrivateKey
- OtherPrimeInfo
2022-02-27 00:36:32 -06:00
terrafrost
004aec954f
Merge branch '3.0'
2022-02-19 18:08:40 -06:00
terrafrost
f2e9dd993d
ChaCha20: ignore coding standards
2022-02-19 17:33:15 -06:00
terrafrost
a0d06e5e81
CS adjustments
2022-02-19 17:19:08 -06:00
Jack Worman
ea9f6540f3
PSR12 fixes
...
PSR12 fixes
2022-02-19 17:06:13 -06:00
terrafrost
87be41b0ee
Merge branch '3.0'
2022-02-18 01:52:28 -06:00
terrafrost
566d74b991
Merge branch '2.0' into 3.0
2022-02-18 01:47:58 -06:00
terrafrost
60b1e2cb18
Merge branch '1.0' into 2.0
2022-02-18 01:46:00 -06:00
terrafrost
7ce96d9337
Crypt/Base: sodium_increment uses the opposite endianness
2022-02-18 01:45:29 -06:00
terrafrost
c56d8525ef
Strings: increment_str should return incremented value
2022-02-17 23:45:07 -06:00
terrafrost
28019bb8f8
Merge branch '3.0'
2022-02-17 23:07:24 -06:00
terrafrost
b510af1cb5
Merge branch '2.0' into 3.0
2022-02-17 23:07:16 -06:00
terrafrost
7a0b96ecfa
Merge branch '1.0' into 2.0
2022-02-17 23:00:53 -06:00
terrafrost
1ba024df94
Crypt/Base: use sodium_increment in _increment_str
2022-02-17 22:50:56 -06:00
terrafrost
8d07631d81
Merge branch '3.0'
2022-02-17 22:27:58 -06:00
terrafrost
97eea332c5
PuTTY: add support for saving PuTTY v3 keys
2022-02-17 22:24:46 -06:00
terrafrost
7cbd239124
Merge branch '3.0'
2022-02-17 08:22:56 -06:00
terrafrost
9f6af761b0
Merge branch '2.0' into 3.0
2022-02-17 08:19:47 -06:00
terrafrost
019b4ffd3a
Merge branch '1.0' into 2.0
2022-02-17 00:35:01 -06:00
terrafrost
45d2ddcbc4
RSA: add support for loading PuTTY v3 keys
2022-02-17 00:32:21 -06:00
terrafrost
b58f7dc4ac
Merge branch '3.0'
2022-02-14 23:25:28 -06:00
terrafrost
27f578797d
XML Key loading tweaks
2022-02-14 23:20:29 -06:00
terrafrost
e2f9d10660
Merge branch '3.0'
2022-02-14 21:19:59 -06:00
terrafrost
7d3dbccd72
DH/PKCS8: encryption options couldn't be set for PKCS8 private keys
2022-02-14 21:19:29 -06:00
terrafrost
5bc572e2ce
EC/PKCS8: OpenSSL didn't like phpseclib formed Ed25519 private keys
...
Tested with openssl pkey -in private.pem -pubout -text on
OpenSSL 1.1.1f 31 Mar 2020
2022-02-14 21:15:36 -06:00
terrafrost
c1da7c5e8a
Merge branch '3.0'
2022-02-14 20:14:14 -06:00
terrafrost
f1dec13c38
PKCS8: the parent class shouldn't be directly called
2022-02-14 20:09:33 -06:00
terrafrost
c233a385cc
Merge branch '3.0'
2022-02-14 19:34:16 -06:00
terrafrost
dc488f967f
PKCS8: fix private key creation
2022-02-14 19:27:47 -06:00
terrafrost
ffbddd8152
Merge branch '3.0'
2022-02-14 17:59:57 -06:00
terrafrost
91a674a781
RSA/PrivateKey: add comment to explain things
2022-02-14 17:59:41 -06:00
terrafrost
6f19948091
Merge branch '1.0' into 2.0
2022-02-14 17:52:16 -06:00
terrafrost
f05091ca95
SSH2/Agent: backport fix from master branch
2022-02-14 17:51:53 -06:00
terrafrost
86c0007078
SFTP: backport fix from master
2022-02-14 17:42:49 -06:00
terrafrost
b5a3b05574
Merge branch '2.0'
2022-02-14 17:35:58 -06:00