diff --git a/pisa-btc/apps/cli/__init__.py b/pisa-btc/apps/cli/__init__.py index 3281608..6a47997 100644 --- a/pisa-btc/apps/cli/__init__.py +++ b/pisa-btc/apps/cli/__init__.py @@ -1,2 +1,10 @@ +# PISA-SERVER DEFAULT_PISA_API_SERVER = 'localhost' -DEFAULT_PISA_API_PORT = 9814 \ No newline at end of file +DEFAULT_PISA_API_PORT = 9814 + +# PISA-CLI +CLIENT_LOG_FILE = 'pisa.log' + +# CRYPTO +SUPPORTED_HASH_FUNCTIONS = ["SHA256"] +SUPPORTED_CIPHERS = ["AES-GCM-128"] \ No newline at end of file diff --git a/pisa-btc/apps/cli/blob.py b/pisa-btc/apps/cli/blob.py index a82b8ad..3b64584 100644 --- a/pisa-btc/apps/cli/blob.py +++ b/pisa-btc/apps/cli/blob.py @@ -1,7 +1,7 @@ from binascii import hexlify, unhexlify from hashlib import sha256 from cryptography.hazmat.primitives.ciphers.aead import AESGCM -from conf import SUPPORTED_HASH_FUNCTIONS, SUPPORTED_CIPHERS +from apps.cli import SUPPORTED_HASH_FUNCTIONS, SUPPORTED_CIPHERS class Blob: diff --git a/pisa-btc/apps/cli/pisa-cli.py b/pisa-btc/apps/cli/pisa-cli.py index 860eef9..9d49f5d 100644 --- a/pisa-btc/apps/cli/pisa-cli.py +++ b/pisa-btc/apps/cli/pisa-cli.py @@ -6,12 +6,11 @@ import logging import requests from sys import argv from getopt import getopt, GetoptError -from conf import CLIENT_LOG_FILE from hashlib import sha256 from binascii import unhexlify from apps.cli.blob import Blob from requests import ConnectTimeout, ConnectionError -from apps.cli import DEFAULT_PISA_API_SERVER, DEFAULT_PISA_API_PORT +from apps.cli import DEFAULT_PISA_API_SERVER, DEFAULT_PISA_API_PORT, CLIENT_LOG_FILE from apps.cli.help import help_add_appointment, help_get_appointment