| 61,16 → 61,11 |
|---|
| # PBKDF2 stolen from Revelation |
| from relevation import PBKDF2, __version__, __author__, RELEASE |
| |
| # Note PyCryptodome uses Crypto but the debian package uses Cryptodome |
| # TODO: Figure out a cleaner way to handle this? |
| try: |
| from Crypto.Cipher import AES |
| from Cryptodome.Cipher import AES |
| except (ImportError, ModuleNotFoundError): |
| try: |
| from Cryptodome.Cipher import AES |
| except (ImportError, ModuleNotFoundError): |
| sys.stderr.write('PyCryptodome is required\n') |
| raise |
| sys.stderr.write('PyCryptodome is required\n') |
| raise |
| |
| RELEASE=True |
| __author__ = 'Toni Corvera' |
| 574,8 → 569,8 |
|---|
| release=' [DEBUG]' |
| print('Relevation version %s%s' % ( __version__, release )) |
| print('Python version %s' % sys.version) |
| import Crypto |
| print('PyCryptodome version %s' % Crypto.__version__) |
| import Cryptodome |
| print('PyCryptodome version %s' % Cryptodome.__version__) |
| sys.exit(os.EX_OK) |
| |
| for opt, arg in ops: |