Рефакторинг кода
This commit is contained in:
parent
b006da649e
commit
2509db96d0
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
/.venv/
|
/.venv/
|
||||||
/keys/
|
/keys/
|
||||||
|
*.pem
|
||||||
|
12
main.py
12
main.py
@ -1,7 +1,7 @@
|
|||||||
import os
|
import os
|
||||||
from encrypt import encrypt_message
|
from utilits.encrypt import encrypt_message
|
||||||
from decrypt import decrypt_message
|
from utilits.decrypt import decrypt_message
|
||||||
from generate_save import generate_private_key, generate_public_key, save_private_key, save_public_key
|
from utilits.generate_save import generate_private_key, generate_public_key, save_private_key, save_public_key
|
||||||
|
|
||||||
KEYS_DIR = 'keys'
|
KEYS_DIR = 'keys'
|
||||||
PRIVATE_KEY_FILE = f'{KEYS_DIR}/private-key.pem'
|
PRIVATE_KEY_FILE = f'{KEYS_DIR}/private-key.pem'
|
||||||
@ -10,15 +10,13 @@ PUBLIC_KEY_FILE = f'{KEYS_DIR}/public-key.pem'
|
|||||||
if not os.path.exists(KEYS_DIR):
|
if not os.path.exists(KEYS_DIR):
|
||||||
os.makedirs(KEYS_DIR)
|
os.makedirs(KEYS_DIR)
|
||||||
|
|
||||||
action = input("Хотите сгенерировать новые ключи (1) или использовать существующие (2)? ")
|
if not os.path.exists(PRIVATE_KEY_FILE) and not os.path.exists(PUBLIC_KEY_FILE):
|
||||||
|
|
||||||
if action == '1':
|
|
||||||
private_key = generate_private_key()
|
private_key = generate_private_key()
|
||||||
save_private_key(private_key, PRIVATE_KEY_FILE)
|
save_private_key(private_key, PRIVATE_KEY_FILE)
|
||||||
public_key = generate_public_key(private_key)
|
public_key = generate_public_key(private_key)
|
||||||
save_public_key(public_key, PUBLIC_KEY_FILE)
|
save_public_key(public_key, PUBLIC_KEY_FILE)
|
||||||
print(f"Новые ключи сгенерированы и сохранены в '{PRIVATE_KEY_FILE}' и '{PUBLIC_KEY_FILE}'.")
|
print(f"Новые ключи сгенерированы и сохранены в '{PRIVATE_KEY_FILE}' и '{PUBLIC_KEY_FILE}'.")
|
||||||
elif action == '2':
|
else:
|
||||||
if os.path.exists(PRIVATE_KEY_FILE) and os.path.exists(PUBLIC_KEY_FILE):
|
if os.path.exists(PRIVATE_KEY_FILE) and os.path.exists(PUBLIC_KEY_FILE):
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
|
@ -3,6 +3,7 @@ from cryptography.hazmat.backends import default_backend
|
|||||||
from cryptography.hazmat.primitives import serialization, hashes
|
from cryptography.hazmat.primitives import serialization, hashes
|
||||||
from cryptography.hazmat.primitives.asymmetric import padding
|
from cryptography.hazmat.primitives.asymmetric import padding
|
||||||
|
|
||||||
|
|
||||||
def load_keys_private(private_key_file):
|
def load_keys_private(private_key_file):
|
||||||
with open(private_key_file, 'rb') as f:
|
with open(private_key_file, 'rb') as f:
|
||||||
private_key_data = f.read()
|
private_key_data = f.read()
|
||||||
@ -14,6 +15,7 @@ def load_keys_private(private_key_file):
|
|||||||
)
|
)
|
||||||
return private_key
|
return private_key
|
||||||
|
|
||||||
|
|
||||||
def decrypt_message(encrypted_message, private_key_file):
|
def decrypt_message(encrypted_message, private_key_file):
|
||||||
private_key = load_keys_private(private_key_file)
|
private_key = load_keys_private(private_key_file)
|
||||||
encrypted_bytes = base64.b64decode(encrypted_message)
|
encrypted_bytes = base64.b64decode(encrypted_message)
|
@ -26,4 +26,3 @@ def encrypt_message(message, public_key_file):
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
return base64.b64encode(encrypted).decode('utf-8')
|
return base64.b64encode(encrypted).decode('utf-8')
|
||||||
|
|
@ -32,12 +32,3 @@ def save_public_key(public_key, public_key_file):
|
|||||||
encoding=serialization.Encoding.PEM,
|
encoding=serialization.Encoding.PEM,
|
||||||
format=serialization.PublicFormat.SubjectPublicKeyInfo
|
format=serialization.PublicFormat.SubjectPublicKeyInfo
|
||||||
))
|
))
|
||||||
|
|
||||||
|
|
||||||
# Пример использования
|
|
||||||
if __name__ == "__main__":
|
|
||||||
private_key = generate_private_key()
|
|
||||||
public_key = generate_public_key(private_key)
|
|
||||||
|
|
||||||
save_private_key(private_key, 'private_key.pem')
|
|
||||||
save_public_key(public_key, 'public_key.pem')
|
|
Loading…
Reference in New Issue
Block a user