Skip to content

Commit 20a0d93

Browse files
authored
Move ssl_check.py to chia/ssl (#19596)
1 parent c800e06 commit 20a0d93

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

chia/_tests/util/test_ssl_check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import pytest
77

88
from chia.ssl.create_ssl import create_all_ssl
9-
from chia.util.ssl_check import check_ssl
9+
from chia.ssl.ssl_check import check_ssl
1010

1111

1212
def test_check_ssl_stream_with_bad_permissions(

chia/cmds/chia.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
from chia.cmds.start import start_cmd
2828
from chia.cmds.stop import stop_cmd
2929
from chia.cmds.wallet import wallet_cmd
30+
from chia.ssl.ssl_check import check_ssl
3031
from chia.util.default_root import DEFAULT_KEYS_ROOT_PATH, resolve_root_path
3132
from chia.util.errors import KeychainCurrentPassphraseIsInvalid
3233
from chia.util.keychain import Keychain, set_keys_root_path
33-
from chia.util.ssl_check import check_ssl
3434

3535
CONTEXT_SETTINGS = {
3636
"help_option_names": ["-h", "--help"],

chia/cmds/init_funcs.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@
1111
from chia.cmds.configure import configure
1212
from chia.consensus.coinbase import create_puzzlehash_for_pk
1313
from chia.ssl.create_ssl import create_all_ssl
14+
from chia.ssl.ssl_check import (
15+
DEFAULT_PERMISSIONS_CERT_FILE,
16+
DEFAULT_PERMISSIONS_KEY_FILE,
17+
RESTRICT_MASK_CERT_FILE,
18+
RESTRICT_MASK_KEY_FILE,
19+
check_and_fix_permissions_for_ssl_file,
20+
fix_ssl,
21+
)
1422
from chia.util.bech32m import encode_puzzle_hash
1523
from chia.util.config import (
1624
create_default_chia_config,
@@ -23,14 +31,6 @@
2331
from chia.util.db_version import set_db_version
2432
from chia.util.keychain import Keychain
2533
from chia.util.path import path_from_root
26-
from chia.util.ssl_check import (
27-
DEFAULT_PERMISSIONS_CERT_FILE,
28-
DEFAULT_PERMISSIONS_KEY_FILE,
29-
RESTRICT_MASK_CERT_FILE,
30-
RESTRICT_MASK_KEY_FILE,
31-
check_and_fix_permissions_for_ssl_file,
32-
fix_ssl,
33-
)
3434
from chia.wallet.derive_keys import (
3535
_derive_path,
3636
_derive_path_unhardened,

chia/server/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
from chia.server.outbound_message import Message, NodeType
3636
from chia.server.ssl_context import private_ssl_paths, public_ssl_paths
3737
from chia.server.ws_connection import ConnectionCallback, WSChiaConnection
38+
from chia.ssl.ssl_check import verify_ssl_certs_and_keys
3839
from chia.types.peer_info import PeerInfo
3940
from chia.util.errors import Err, ProtocolError
4041
from chia.util.network import WebServer, is_in_network, is_localhost, is_trusted_peer
41-
from chia.util.ssl_check import verify_ssl_certs_and_keys
4242
from chia.util.streamable import Streamable
4343
from chia.util.task_referencer import create_referenced_task
4444

chia/simulator/block_tools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
)
8484
from chia.simulator.wallet_tools import WalletTool
8585
from chia.ssl.create_ssl import create_all_ssl
86+
from chia.ssl.ssl_check import fix_ssl
8687
from chia.types.blockchain_format.classgroup import ClassgroupElement
8788
from chia.types.blockchain_format.coin import Coin
8889
from chia.types.blockchain_format.program import DEFAULT_FLAGS, INFINITE_COST, Program
@@ -111,7 +112,6 @@
111112
from chia.util.default_root import DEFAULT_ROOT_PATH
112113
from chia.util.hash import std_hash
113114
from chia.util.keychain import Keychain, bytes_to_mnemonic
114-
from chia.util.ssl_check import fix_ssl
115115
from chia.util.timing import adjusted_timeout, backoff_times
116116
from chia.util.vdf_prover import get_vdf_info_and_proof
117117
from chia.wallet.derive_keys import (

chia/ssl/create_ssl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from cryptography.hazmat.primitives.serialization import load_pem_private_key
1414
from cryptography.x509.oid import NameOID
1515

16-
from chia.util.ssl_check import DEFAULT_PERMISSIONS_CERT_FILE, DEFAULT_PERMISSIONS_KEY_FILE
16+
from chia.ssl.ssl_check import DEFAULT_PERMISSIONS_CERT_FILE, DEFAULT_PERMISSIONS_KEY_FILE
1717

1818
_all_private_node_names: list[str] = [
1919
"full_node",
File renamed without changes.

0 commit comments

Comments
 (0)