From 246e5008918d7ec853d073088565fd0b28f93349 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Sat, 22 Jan 2022 14:26:14 +0000 Subject: [PATCH] crypto.py: import cleanups --- mmgen/crypto.py | 20 +++++++++++++++++++- mmgen/main_addrgen.py | 1 - mmgen/main_passgen.py | 1 - 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/mmgen/crypto.py b/mmgen/crypto.py index 9b1e3fd5..37ecd143 100755 --- a/mmgen/crypto.py +++ b/mmgen/crypto.py @@ -20,10 +20,28 @@ crypto.py: Cryptographic and related routines for the MMGen suite """ +import os from cryptography.hazmat.primitives.ciphers import Cipher,algorithms,modes from cryptography.hazmat.backends import default_backend from hashlib import sha256 -from .common import * +from collections import namedtuple + +from .globalvars import g +from .opts import opt +from .util import ( + msg, + msg_r, + dmsg, + vmsg, + vmsg_r, + qmsg, + fmt, + line_input, + get_words_from_user, + make_chksum_8, + compare_chksums, + pwfile_reuse_warning, +) mmenc_ext = 'mmenc' diff --git a/mmgen/main_addrgen.py b/mmgen/main_addrgen.py index c2c71cdf..8fc36b55 100755 --- a/mmgen/main_addrgen.py +++ b/mmgen/main_addrgen.py @@ -22,7 +22,6 @@ mmgen-addrgen: Generate a series or range of addresses from an MMGen """ from .common import * -from .crypto import * from .addr import MMGenAddrType from .addrlist import AddrList,KeyAddrList,KeyList,AddrIdxList from .addrfile import AddrFile diff --git a/mmgen/main_passgen.py b/mmgen/main_passgen.py index bbd93654..1c3b7b0b 100755 --- a/mmgen/main_passgen.py +++ b/mmgen/main_passgen.py @@ -22,7 +22,6 @@ mmgen-passgen: Generate a series or range of passwords from an MMGen """ from .common import * -from .crypto import * from .addrlist import AddrIdxList from .passwdlist import PasswordList from .wallet import Wallet