diff options
author | Sverker Eriksson <[email protected]> | 2014-02-19 16:32:12 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2014-02-19 16:32:12 +0100 |
commit | 8c17e706e212b859f1a248f43c8091e8d541b08e (patch) | |
tree | 39bb2de5f3d2c11cb9bbb20144e56486d710171d /erts/emulator/test/nif_SUITE_data/nif_SUITE.c | |
parent | 9fbb7a9a72a9b9f2bc12aebdbc89cac4bcd21873 (diff) | |
parent | 651b949d85f847318ece301b64c099ad7959e9d0 (diff) | |
download | otp-8c17e706e212b859f1a248f43c8091e8d541b08e.tar.gz otp-8c17e706e212b859f1a248f43c8091e8d541b08e.tar.bz2 otp-8c17e706e212b859f1a248f43c8091e8d541b08e.zip |
Merge branch 'sverk/crypto/hmac-context-reuse-bug'
OTP-11722
OTP-11724
* sverk/crypto/hmac-context-reuse-bug:
crypto: Fix bug when using old hmac context
erts: Fix NIF bug when load/upgrade fails after enif_open_resource_type
Conflicts:
erts/emulator/test/nif_SUITE.erl
Diffstat (limited to 'erts/emulator/test/nif_SUITE_data/nif_SUITE.c')
-rw-r--r-- | erts/emulator/test/nif_SUITE_data/nif_SUITE.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c index b550d1f16d..160f4843ad 100644 --- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c +++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c @@ -1477,7 +1477,6 @@ static ERL_NIF_TERM consume_timeslice_nif(ErlNifEnv* env, int argc, const ERL_NI { int percent; char atom[10]; - int do_repeat; if (!enif_get_int(env, argv[0], &percent) || !enif_get_atom(env, argv[1], atom, sizeof(atom), ERL_NIF_LATIN1)) { |