crypto.py: import cleanups

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'
 

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

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