diff options
| author | Björn Gustavsson <[email protected]> | 2013-05-13 11:13:50 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-05-20 08:41:52 +0200 |
| commit | 5805b576e5c817faf697985ea2d2ce205d9b52d4 (patch) | |
| tree | 9d911868ae6815986e91a9b449869dd8bff8ab64 /lib/compiler/test | |
| parent | b5d466db4dd8891cceaaa5a4b4e81f6edad639d2 (diff) | |
| download | otp-5805b576e5c817faf697985ea2d2ce205d9b52d4.tar.gz otp-5805b576e5c817faf697985ea2d2ce205d9b52d4.tar.bz2 otp-5805b576e5c817faf697985ea2d2ce205d9b52d4.zip | |
beam_lib, compile: Replace use of deprecated crypto functions
Since both the STDLIB and compiler applications turn warnings
into errors, we must stop using the old deprecated crypto functions.
While we are at it, generalize the format of the key tuple returned
by beam_lib:make_crypto_key/2 to facilitate introducing new crypto
methods in the future. Change the format to:
{Type,Key,IV,BlockSize}
where Type, Key, and IV are the first three arguments for either
crypto:block_encrypt4/ or crypto:block_decrypt/4, and BlockSize
is the block size for the crypto algorithm (it is needed to properly
pad the plaintext blocks before encryption).
Diffstat (limited to 'lib/compiler/test')
| -rw-r--r-- | lib/compiler/test/compile_SUITE.erl | 10 | ||||
| -rw-r--r-- | lib/compiler/test/compile_SUITE_data/key_compatibility.beam | bin | 0 -> 844 bytes | |||
| -rw-r--r-- | lib/compiler/test/compile_SUITE_data/key_compatibility.erl | 8 |
3 files changed, 18 insertions, 0 deletions
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl index 229e5a98a1..c635d13c89 100644 --- a/lib/compiler/test/compile_SUITE.erl +++ b/lib/compiler/test/compile_SUITE.erl @@ -492,6 +492,16 @@ encrypted_abstr_1(Simple, Target) -> ?line {error,beam_lib,{key_missing_or_invalid,"simple.beam",abstract_code}} = beam_lib:chunks("simple.beam", [abstract_code]), ?line ok = file:set_cwd(OldCwd), + + %% Test key compatibility by reading a BEAM file produced before + %% the update to the new crypto functions. + install_crypto_key("an old key"), + KeyCompat = filename:join(filename:dirname(Simple), + "key_compatibility"), + {ok,{key_compatibility,[Chunk]}} = beam_lib:chunks(KeyCompat, + [abstract_code]), + {abstract_code,{raw_abstract_v1,_}} = Chunk, + ok. diff --git a/lib/compiler/test/compile_SUITE_data/key_compatibility.beam b/lib/compiler/test/compile_SUITE_data/key_compatibility.beam Binary files differnew file mode 100644 index 0000000000..28329d2423 --- /dev/null +++ b/lib/compiler/test/compile_SUITE_data/key_compatibility.beam diff --git a/lib/compiler/test/compile_SUITE_data/key_compatibility.erl b/lib/compiler/test/compile_SUITE_data/key_compatibility.erl new file mode 100644 index 0000000000..e2931f1b12 --- /dev/null +++ b/lib/compiler/test/compile_SUITE_data/key_compatibility.erl @@ -0,0 +1,8 @@ +-module(key_compatibility). +-export([main/0]). + +%% Compile like this: +%% erlc +'{debug_info_key,"an old key"}' key_compatibility.erl + +main() -> + ok. |