diff options
Diffstat (limited to '')
| -rw-r--r-- | test/cavp.py | 70 | ||||
| -rw-r--r-- | test/file.py | 42 | ||||
| -rw-r--r-- | test/nist-sp-800-38a.py | 255 | ||||
| -rw-r--r-- | test/toolkit.py | 45 |
4 files changed, 252 insertions, 160 deletions
diff --git a/test/cavp.py b/test/cavp.py index 059bcd2..2508bda 100644 --- a/test/cavp.py +++ b/test/cavp.py @@ -51,11 +51,11 @@ class _TestVectorsFile: self._archive = archive self._path = path self._fn = os.path.split(path)[1] - self._valid = False + self._recognized = False self._parse() - def valid(self): - return self._valid + def recognized(self): + return self._recognized def algorithm(self): return self._algo @@ -64,10 +64,11 @@ class _TestVectorsFile: return self._mode def parse(self): - self._parser = configparser.ConfigParser(dict_type=_MultiOrderedDict, - strict=False, - interpolation=None, - empty_lines_in_values=False) + self._parser = configparser.ConfigParser( + dict_type=_MultiOrderedDict, + strict=False, + interpolation=None, + empty_lines_in_values=False) self._parser.read_string(self._archive.read(self._path).decode('utf-8')) def _extract_test_data(self, section): @@ -80,16 +81,11 @@ class _TestVectorsFile: return keys, plaintexts, ciphertexts, init_vectors def _run_tests(self, tool, inputs, expected_output): - try: - for expected_output_chunk, input_chunk in _split_into_chunks(expected_output, list(inputs)): - actual_output = tool(self.algorithm(), self.mode(), input_chunk) - if not _assert_output(actual_output, expected_output_chunk): - return _TestExitCode.FAILURE - return _TestExitCode.SUCCESS - except toolkit.ToolkitError as e: - logging.error('Encountered an exception, skipping...') - logging.exception(e) - return _TestExitCode.ERROR + for expected_output_chunk, input_chunk in _split_into_chunks(expected_output, list(inputs)): + actual_output = tool(self.algorithm(), self.mode(), input_chunk) + if not _assert_output(actual_output, expected_output_chunk): + return _TestExitCode.FAILURE + return _TestExitCode.SUCCESS def run_encryption_tests(self, tools): logging.info('Running encryption tests...') @@ -113,7 +109,7 @@ class _TestVectorsFile: if not stub: return stub = self._strip_mode(stub) if not stub: return - self._valid = True + self._recognized = True def _strip_extension(self, stub): stub, ext = os.path.splitext(stub) @@ -125,12 +121,12 @@ class _TestVectorsFile: def _strip_algorithm(self, stub): algo_size = stub[-3:] maybe_algo = 'aes{0}'.format(algo_size) - self._algo = toolkit.to_supported_algorithm(maybe_algo) + self._algo = toolkit.is_algorithm_supported(maybe_algo) if self._algo: logging.info('\tAlgorithm: {0}'.format(self._algo)) return stub[0:-3] else: - logging.warn('Unknown or unsupported algorithm \'{0}\''.format(self._fn)) + logging.warn('Unknown or unsupported algorithm: ' + self._fn) return None def _strip_method(self, stub): @@ -138,26 +134,36 @@ class _TestVectorsFile: if stub.endswith(method): logging.info('\tMethod: {0}'.format(method)) return stub[0:len(stub) - len(method)] - logging.warn('Unknown or unsupported method \'{0}\''.format(self._fn)) + logging.warn('Unknown or unsupported method: ' + self._fn) def _strip_mode(self, stub): - self._mode = toolkit.to_supported_mode(stub) + self._mode = toolkit.is_mode_supported(stub) if self._mode: logging.info('\tMode: {0}'.format(self._mode)) return self._mode else: - logging.warn('Unknown or unsupported mode \'{0}\''.format(self._fn)) + logging.warn('Unknown or unsupported mode: ' + self._fn) return None -def _parse_test_vectors_archive(tools, archive_path='KAT_AES.zip'): +def _parse_archive_and_run_tests(tools, archive_path): archive = zipfile.ZipFile(archive_path) exit_codes = [] for fn in archive.namelist(): member = _TestVectorsFile(fn, archive) - if member.valid(): + if member.recognized(): member.parse() - exit_codes.append(member.run_encryption_tests(tools)) - exit_codes.append(member.run_decryption_tests(tools)) + try: + exit_codes.append(member.run_encryption_tests(tools)) + except Exception as e: + logging.error('Encountered an exception!') + logging.exception(e) + exit_codes.append(_TestExitCode.ERROR) + try: + exit_codes.append(member.run_decryption_tests(tools)) + except Exception as e: + logging.error('Encountered an exception!') + logging.exception(e) + exit_codes.append(_TestExitCode.ERROR) else: exit_codes.append(_TestExitCode.SKIPPED) logging.info('Test exit codes:') @@ -180,11 +186,15 @@ if __name__ == '__main__': help='use Intel SDE to run *.exe files') parser.add_argument('--box', '-b', action='store_true', help='use the "boxes" interface') + parser.add_argument('--archive', '-a', default='KAT_AES.zip', + help='set path of the archive with the test vectors') parser.add_argument('--log', '-l', help='set log file path') args = parser.parse_args() - logging_options = {'format': '%(asctime)s | %(module)s | %(levelname)s | %(message)s', - 'level': logging.DEBUG} + logging_options = { + 'format': '%(asctime)s | %(module)s | %(levelname)s | %(message)s', + 'level': logging.DEBUG } + if args.log is None: logging_options['filename'] = datetime.now().strftime('cavp_%Y-%m-%d_%H-%M-%S.log') else: @@ -192,4 +202,4 @@ if __name__ == '__main__': logging.basicConfig(**logging_options) tools = toolkit.Tools(args.path, use_sde=args.sde, use_boxes=args.box) - _parse_test_vectors_archive(tools) + _parse_archive_and_run_tests(tools, args.archive) diff --git a/test/file.py b/test/file.py index 7952529..7afd09a 100644 --- a/test/file.py +++ b/test/file.py @@ -33,10 +33,9 @@ def _run_encryption_test(tools, tmp_dir, algo, mode, key, plain_path, cipher_pat shutil.copy(tmp_path, cipher_path) return _TestExitCode.SUCCESS if filecmp.cmp(cipher_path, tmp_path): - logging.info('The encrypted file matches the ciphertext file') return _TestExitCode.SUCCESS else: - logging.info('The encrypted file doesn\'t match the ciphertext file') + logging.error('The encrypted file doesn\'t match the ciphertext file') return _TestExitCode.FAILURE def _run_decryption_test(tools, tmp_dir, algo, mode, key, cipher_path, plain_path, iv=None): @@ -47,10 +46,9 @@ def _run_decryption_test(tools, tmp_dir, algo, mode, key, cipher_path, plain_pat logging.info('\tDecrypted file path: ' + tmp_path) tools.run_decrypt_file(algo, mode, key, cipher_path, tmp_path, iv) if filecmp.cmp(tmp_path, plain_path): - logging.info('The decrypted file matches the plaintext file') return _TestExitCode.SUCCESS else: - logging.info('The decrypted file doesn\'t match the plaintext file') + logging.error('The decrypted file doesn\'t match the plaintext file') return _TestExitCode.FAILURE def _list_dirs(root_path): @@ -96,11 +94,21 @@ def _run_tests(tools, suite_dir, force=False): with TemporaryDirectory() as tmp_dir: for algo_dir in _list_dirs(suite_dir): algo = os.path.basename(algo_dir) - algo = toolkit.to_supported_algorithm(algo) + maybe_algo = toolkit.is_algorithm_supported(algo) + if maybe_algo is None: + logging.warn('Unknown or unsupported algorithm: ' + algo) + exit_codes.append(_TestExitCode.SKIPPED) + continue + algo = maybe_algo logging.info('Algorithm: ' + algo) for mode_dir in _list_dirs(algo_dir): mode = os.path.basename(mode_dir) - mode = toolkit.to_supported_mode(mode) + maybe_mode = toolkit.is_mode_supported(mode) + if maybe_mode is None: + logging.warn('Unknown or unsupported mode: ' + mode) + exit_codes.append(_TestExitCode.SKIPPED) + continue + mode = maybe_mode logging.info('Mode: ' + mode) for key_path in _list_keys(mode_dir): key = _read_key(key_path) @@ -114,13 +122,23 @@ def _run_tests(tools, suite_dir, force=False): plain_path = _build_plain_path(key_path) cipher_path = _build_cipher_path(key_path) os.makedirs(os.path.join(tmp_dir, algo, mode)) - exit_codes.append(_run_encryption_test( - tools, os.path.join(tmp_dir, algo, mode), - algo, mode, key, plain_path, cipher_path, iv, force)) - if not force: - exit_codes.append(_run_decryption_test( + try: + exit_codes.append(_run_encryption_test( tools, os.path.join(tmp_dir, algo, mode), - algo, mode, key, cipher_path, plain_path, iv)) + algo, mode, key, plain_path, cipher_path, iv, force)) + except Exception as e: + logging.error('Encountered an exception!') + logging.exception(e) + exit_codes.append(_TestExitCode.ERROR) + if not force: + try: + exit_codes.append(_run_decryption_test( + tools, os.path.join(tmp_dir, algo, mode), + algo, mode, key, cipher_path, plain_path, iv)) + except Exception as e: + logging.error('Encountered an exception!') + logging.exception(e) + exit_codes.append(_TestExitCode.ERROR) logging.info('Test exit codes:') logging.info('\tSkipped: {0}'.format(exit_codes.count(_TestExitCode.SKIPPED))) logging.info('\tError(s): {0}'.format(exit_codes.count(_TestExitCode.ERROR))) diff --git a/test/nist-sp-800-38a.py b/test/nist-sp-800-38a.py index 8a7d010..7189dde 100644 --- a/test/nist-sp-800-38a.py +++ b/test/nist-sp-800-38a.py @@ -7,85 +7,132 @@ import logging import toolkit import sys -_plaintexts = ['6bc1bee22e409f96e93d7e117393172a', - 'ae2d8a571e03ac9c9eb76fac45af8e51', - '30c81c46a35ce411e5fbc1191a0a52ef', - 'f69f2445df4f9b17ad2b417be66c3710'] - -_keys = {toolkit.AES128: '2b7e151628aed2a6abf7158809cf4f3c', - toolkit.AES192: '8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b', - toolkit.AES256: '603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4'} +_plaintexts = [ + '6bc1bee22e409f96e93d7e117393172a', + 'ae2d8a571e03ac9c9eb76fac45af8e51', + '30c81c46a35ce411e5fbc1191a0a52ef', + 'f69f2445df4f9b17ad2b417be66c3710' +] + +_keys = { + toolkit.AES128: '2b7e151628aed2a6abf7158809cf4f3c', + toolkit.AES192: '8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b', + toolkit.AES256: '603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4' +} _default_iv = '000102030405060708090a0b0c0d0e0f' _ctr_iv = 'f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff' -_init_vectors = {toolkit.AES128: {toolkit.CBC: _default_iv, - toolkit.CFB: _default_iv, - toolkit.OFB: _default_iv, - toolkit.CTR: _ctr_iv}} +_init_vectors = { + toolkit.AES128: { + toolkit.CBC: _default_iv, + toolkit.CFB: _default_iv, + toolkit.OFB: _default_iv, + toolkit.CTR: _ctr_iv + } +} + _init_vectors[toolkit.AES192] = _init_vectors[toolkit.AES128] _init_vectors[toolkit.AES256] = _init_vectors[toolkit.AES128] -_ciphertexts = {toolkit.AES128: {toolkit.ECB: ['3ad77bb40d7a3660a89ecaf32466ef97', - 'f5d3d58503b9699de785895a96fdbaaf', - '43b1cd7f598ece23881b00e3ed030688', - '7b0c785e27e8ad3f8223207104725dd4'], - toolkit.CBC: ['7649abac8119b246cee98e9b12e9197d', - '5086cb9b507219ee95db113a917678b2', - '73bed6b8e3c1743b7116e69e22229516', - '3ff1caa1681fac09120eca307586e1a7'], - toolkit.CFB: ['3b3fd92eb72dad20333449f8e83cfb4a', - 'c8a64537a0b3a93fcde3cdad9f1ce58b', - '26751f67a3cbb140b1808cf187a4f4df', - 'c04b05357c5d1c0eeac4c66f9ff7f2e6'], - toolkit.OFB: ['3b3fd92eb72dad20333449f8e83cfb4a', - '7789508d16918f03f53c52dac54ed825', - '9740051e9c5fecf64344f7a82260edcc', - '304c6528f659c77866a510d9c1d6ae5e'], - toolkit.CTR: ['874d6191b620e3261bef6864990db6ce', - '9806f66b7970fdff8617187bb9fffdff', - '5ae4df3edbd5d35e5b4f09020db03eab', - '1e031dda2fbe03d1792170a0f3009cee']}, - toolkit.AES192: {toolkit.ECB: ['bd334f1d6e45f25ff712a214571fa5cc', - '974104846d0ad3ad7734ecb3ecee4eef', - 'ef7afd2270e2e60adce0ba2face6444e', - '9a4b41ba738d6c72fb16691603c18e0e'], - toolkit.CBC: ['4f021db243bc633d7178183a9fa071e8', - 'b4d9ada9ad7dedf4e5e738763f69145a', - '571b242012fb7ae07fa9baac3df102e0', - '08b0e27988598881d920a9e64f5615cd'], - toolkit.CFB: ['cdc80d6fddf18cab34c25909c99a4174', - '67ce7f7f81173621961a2b70171d3d7a', - '2e1e8a1dd59b88b1c8e60fed1efac4c9', - 'c05f9f9ca9834fa042ae8fba584b09ff'], - toolkit.OFB: ['cdc80d6fddf18cab34c25909c99a4174', - 'fcc28b8d4c63837c09e81700c1100401', - '8d9a9aeac0f6596f559c6d4daf59a5f2', - '6d9f200857ca6c3e9cac524bd9acc92a'], - toolkit.CTR: ['1abc932417521ca24f2b0459fe7e6e0b', - '090339ec0aa6faefd5ccc2c6f4ce8e94', - '1e36b26bd1ebc670d1bd1d665620abf7', - '4f78a7f6d29809585a97daec58c6b050']}, - toolkit.AES256: {toolkit.ECB: ['f3eed1bdb5d2a03c064b5a7e3db181f8', - '591ccb10d410ed26dc5ba74a31362870', - 'b6ed21b99ca6f4f9f153e7b1beafed1d', - '23304b7a39f9f3ff067d8d8f9e24ecc7'], - toolkit.CBC: ['f58c4c04d6e5f1ba779eabfb5f7bfbd6', - '9cfc4e967edb808d679f777bc6702c7d', - '39f23369a9d9bacfa530e26304231461', - 'b2eb05e2c39be9fcda6c19078c6a9d1b'], - toolkit.CFB: ['dc7e84bfda79164b7ecd8486985d3860', - '39ffed143b28b1c832113c6331e5407b', - 'df10132415e54b92a13ed0a8267ae2f9', - '75a385741ab9cef82031623d55b1e471'], - toolkit.OFB: ['dc7e84bfda79164b7ecd8486985d3860', - '4febdc6740d20b3ac88f6ad82a4fb08d', - '71ab47a086e86eedf39d1c5bba97c408', - '0126141d67f37be8538f5a8be740e484'], - toolkit.CTR: ['601ec313775789a5b7a7f504bbf3d228', - 'f443e3ca4d62b59aca84e990cacaf5c5', - '2b0930daa23de94ce87017ba2d84988d', - 'dfc9c58db67aada613c2dd08457941a6']}} +_ciphertexts = { + toolkit.AES128: { + toolkit.ECB: [ + '3ad77bb40d7a3660a89ecaf32466ef97', + 'f5d3d58503b9699de785895a96fdbaaf', + '43b1cd7f598ece23881b00e3ed030688', + '7b0c785e27e8ad3f8223207104725dd4' + ], + toolkit.CBC: [ + '7649abac8119b246cee98e9b12e9197d', + '5086cb9b507219ee95db113a917678b2', + '73bed6b8e3c1743b7116e69e22229516', + '3ff1caa1681fac09120eca307586e1a7' + ], + toolkit.CFB: [ + '3b3fd92eb72dad20333449f8e83cfb4a', + 'c8a64537a0b3a93fcde3cdad9f1ce58b', + '26751f67a3cbb140b1808cf187a4f4df', + 'c04b05357c5d1c0eeac4c66f9ff7f2e6' + ], + toolkit.OFB: [ + '3b3fd92eb72dad20333449f8e83cfb4a', + '7789508d16918f03f53c52dac54ed825', + '9740051e9c5fecf64344f7a82260edcc', + '304c6528f659c77866a510d9c1d6ae5e' + ], + toolkit.CTR: [ + '874d6191b620e3261bef6864990db6ce', + '9806f66b7970fdff8617187bb9fffdff', + '5ae4df3edbd5d35e5b4f09020db03eab', + '1e031dda2fbe03d1792170a0f3009cee' + ] + }, + toolkit.AES192: { + toolkit.ECB: [ + 'bd334f1d6e45f25ff712a214571fa5cc', + '974104846d0ad3ad7734ecb3ecee4eef', + 'ef7afd2270e2e60adce0ba2face6444e', + '9a4b41ba738d6c72fb16691603c18e0e' + ], + toolkit.CBC: [ + '4f021db243bc633d7178183a9fa071e8', + 'b4d9ada9ad7dedf4e5e738763f69145a', + '571b242012fb7ae07fa9baac3df102e0', + '08b0e27988598881d920a9e64f5615cd' + ], + toolkit.CFB: [ + 'cdc80d6fddf18cab34c25909c99a4174', + '67ce7f7f81173621961a2b70171d3d7a', + '2e1e8a1dd59b88b1c8e60fed1efac4c9', + 'c05f9f9ca9834fa042ae8fba584b09ff' + ], + toolkit.OFB: [ + 'cdc80d6fddf18cab34c25909c99a4174', + 'fcc28b8d4c63837c09e81700c1100401', + '8d9a9aeac0f6596f559c6d4daf59a5f2', + '6d9f200857ca6c3e9cac524bd9acc92a' + ], + toolkit.CTR: [ + '1abc932417521ca24f2b0459fe7e6e0b', + '090339ec0aa6faefd5ccc2c6f4ce8e94', + '1e36b26bd1ebc670d1bd1d665620abf7', + '4f78a7f6d29809585a97daec58c6b050' + ] + }, + toolkit.AES256: { + toolkit.ECB: [ + 'f3eed1bdb5d2a03c064b5a7e3db181f8', + '591ccb10d410ed26dc5ba74a31362870', + 'b6ed21b99ca6f4f9f153e7b1beafed1d', + '23304b7a39f9f3ff067d8d8f9e24ecc7' + ], + toolkit.CBC: [ + 'f58c4c04d6e5f1ba779eabfb5f7bfbd6', + '9cfc4e967edb808d679f777bc6702c7d', + '39f23369a9d9bacfa530e26304231461', + 'b2eb05e2c39be9fcda6c19078c6a9d1b' + ], + toolkit.CFB: [ + 'dc7e84bfda79164b7ecd8486985d3860', + '39ffed143b28b1c832113c6331e5407b', + 'df10132415e54b92a13ed0a8267ae2f9', + '75a385741ab9cef82031623d55b1e471' + ], + toolkit.OFB: [ + 'dc7e84bfda79164b7ecd8486985d3860', + '4febdc6740d20b3ac88f6ad82a4fb08d', + '71ab47a086e86eedf39d1c5bba97c408', + '0126141d67f37be8538f5a8be740e484' + ], + toolkit.CTR: [ + '601ec313775789a5b7a7f504bbf3d228', + 'f443e3ca4d62b59aca84e990cacaf5c5', + '2b0930daa23de94ce87017ba2d84988d', + 'dfc9c58db67aada613c2dd08457941a6' + ] + } +} def _assert_output(actual, expected): if len(actual) != len(expected): @@ -101,45 +148,31 @@ class _TestExitCode: def _run_encryption_tests(tools, algo, mode): logging.info('Running encryption tests...') - logging.info('\tAlgorithm: ' + algo) - logging.info('\tMode: ' + mode) - key = _keys[algo] iv = None if algo in _init_vectors and mode in _init_vectors[algo]: iv = _init_vectors[algo][mode] ciphertexts = _ciphertexts[algo][mode] _input = toolkit.EncryptionInput(key, _plaintexts, iv=iv) - try: - actual_output = tools.run_encrypt_block(algo, mode, _input) - if not _assert_output(actual_output, ciphertexts): - return _TestExitCode.FAILURE + actual_output = tools.run_encrypt_block(algo, mode, _input) + if _assert_output(actual_output, ciphertexts): return _TestExitCode.SUCCESS - except toolkit.ToolkitError as e: - logging.error('Encountered an exception!') - logging.exception(e) - return _TestExitCode.ERROR + else: + return _TestExitCode.FAILURE def _run_decryption_tests(tools, algo, mode): logging.info('Running decryption tests...') - logging.info('\tAlgorithm: ' + algo) - logging.info('\tMode: ' + mode) - key = _keys[algo] iv = None if algo in _init_vectors and mode in _init_vectors[algo]: iv = _init_vectors[algo][mode] ciphertexts = _ciphertexts[algo][mode] _input = toolkit.DecryptionInput(key, ciphertexts, iv=iv) - try: - actual_output = tools.run_decrypt_block(algo, mode, _input) - if not _assert_output(actual_output, _plaintexts): - return _TestExitCode.FAILURE + actual_output = tools.run_decrypt_block(algo, mode, _input) + if _assert_output(actual_output, _plaintexts): return _TestExitCode.SUCCESS - except toolkit.ToolkitError as e: - logging.error('Encountered an exception!') - logging.exception(e) - return _TestExitCode.ERROR + else: + return _TestExitCode.FAILURE if __name__ == '__main__': import argparse @@ -155,8 +188,10 @@ if __name__ == '__main__': tools = toolkit.Tools(args.path, use_sde=args.sde, use_boxes=args.box) - logging_options = {'format': '%(asctime)s | %(module)s | %(levelname)s | %(message)s', - 'level': logging.DEBUG} + logging_options = { + 'format': '%(asctime)s | %(module)s | %(levelname)s | %(message)s', + 'level': logging.DEBUG } + if args.log is None: logging_options['filename'] = datetime.now().strftime('nist-sp-800-38a_%Y-%m-%d_%H-%M-%S.log') else: @@ -165,9 +200,33 @@ if __name__ == '__main__': exit_codes = [] for algo in _ciphertexts: + maybe_algo = toolkit.is_algorithm_supported(algo) + if maybe_algo is None: + logging.warn('Unknown or unsupported algorithm: ' + algo) + exit_codes.append(_TestExitCode.SKIPPED) + continue + algo = maybe_algo + logging.info('Algorithm: ' + algo) for mode in _ciphertexts[algo]: - exit_codes.append(_run_encryption_tests(tools, algo, mode)) - exit_codes.append(_run_decryption_tests(tools, algo, mode)) + maybe_mode = toolkit.is_mode_supported(mode) + if maybe_mode is None: + logging.warn('Unknown or unsupported mode: ' + mode) + exit_codes.append(_TestExitCode.SKIPPED) + continue + mode = maybe_mode + logging.info('Mode: ' + mode) + try: + exit_codes.append(_run_encryption_tests(tools, algo, mode)) + except Exception as e: + logging.error('Encountered an exception!') + logging.exception(e) + exit_codes.append(_TestExitCode.ERROR) + try: + exit_codes.append(_run_decryption_tests(tools, algo, mode)) + except Exception as e: + logging.error('Encountered an exception!') + logging.exception(e) + exit_codes.append(_TestExitCode.ERROR) logging.info('Test exit codes:') logging.info('\tSkipped: {0}'.format(exit_codes.count(_TestExitCode.SKIPPED))) logging.info('\tError(s): {0}'.format(exit_codes.count(_TestExitCode.ERROR))) diff --git a/test/toolkit.py b/test/toolkit.py index 8890269..50a42c9 100644 --- a/test/toolkit.py +++ b/test/toolkit.py @@ -25,18 +25,30 @@ def mode_requires_init_vector(mode): return mode != ECB def to_supported_algorithm(s): + algo = is_algorithm_supported(s) + if algo is None: + raise NotImplementedError('unsupported algorithm ' + s) + return algo + +def is_algorithm_supported(s): s = s.lower() if s in _SUPPORTED_ALGORITHMS: return s - raise NotImplementedError('unsupported algorithm ' + s) + return None def to_supported_mode(s): + mode = is_mode_supported(s) + if mode is None: + raise NotImplementedError('unsupported mode ' + s) + return mode + +def is_mode_supported(s): s = s.lower() if s in _SUPPORTED_MODES: return s if s == CFB + '128': return CFB - raise NotImplementedError('unsupported algorithm ' + s) + return None class EncryptionInput: def __init__(self, key, plaintexts, iv=None): @@ -64,9 +76,6 @@ class DecryptionInput: args.extend(self.ciphertexts) return args -class ToolkitError(RuntimeError): - pass - class Tools: def __init__(self, search_dirs, use_sde=False, use_boxes=False): if search_dirs: @@ -91,14 +100,14 @@ class Tools: cmd_list.append('-b') cmd_list.extend(('-a', algo, '-m', mode)) cmd_list.extend(args) - logging.info('Trying to execute: {0}'.format(subprocess.list2cmdline(cmd_list))) + logging.info('Trying to execute: {0}'.format( + subprocess.list2cmdline(cmd_list))) try: - output = subprocess.check_output(cmd_list, universal_newlines=True, - stderr=subprocess.STDOUT) + output = subprocess.check_output( + cmd_list, universal_newlines=True, stderr=subprocess.STDOUT) except subprocess.CalledProcessError as e: - logging.exception(e) logging.error('Output:\n' + e.output) - raise ToolkitError() from e + raise logging.info('Output:\n' + output) return output.split() @@ -134,19 +143,15 @@ class Tools: def run_encrypt_file(self, algo, mode, key, input_path, output_path, iv=None): if mode_requires_init_vector(mode): if not iv: - raise ToolkitError('mode \'{}\' requires init vector'.format(mode)) - return self.run(self._ENCRYPT_FILE, algo, mode, - (key, iv, input_path, output_path)) + raise ValueError('mode \'{}\' requires init vector'.format(mode)) + return self.run(self._ENCRYPT_FILE, algo, mode, (key, iv, input_path, output_path)) else: - return self.run(self._ENCRYPT_FILE, algo, mode, - (key, input_path, output_path)) + return self.run(self._ENCRYPT_FILE, algo, mode, (key, input_path, output_path)) def run_decrypt_file(self, algo, mode, key, input_path, output_path, iv=None): if mode_requires_init_vector(mode): if not iv: - raise ToolkitError('mode \'{}\' requires init vector'.format(mode)) - return self.run(self._DECRYPT_FILE, algo, mode, - (key, iv, input_path, output_path)) + raise ValueError('mode \'{}\' requires init vector'.format(mode)) + return self.run(self._DECRYPT_FILE, algo, mode, (key, iv, input_path, output_path)) else: - return self.run(self._DECRYPT_FILE, algo, mode, - (key, input_path, output_path)) + return self.run(self._DECRYPT_FILE, algo, mode, (key, input_path, output_path)) |