diff options
| author | Sverker Eriksson <[email protected]> | 2014-06-23 11:45:57 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-06-23 11:45:57 +0200 |
| commit | af116ba70676b95b4a0f1fa23ebbcc1807b7dcb3 (patch) | |
| tree | 30981c6e27a22a389177f6ffcd70da1b7b24ac25 | |
| parent | b0e5e6daf3bb389018079f83535ba044e07749e5 (diff) | |
| parent | 1af8998028f77b4ca01c52972a5983b072ef02d1 (diff) | |
| download | otp-af116ba70676b95b4a0f1fa23ebbcc1807b7dcb3.tar.gz otp-af116ba70676b95b4a0f1fa23ebbcc1807b7dcb3.tar.bz2 otp-af116ba70676b95b4a0f1fa23ebbcc1807b7dcb3.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/crypto/c_src/crypto.c | 17 | ||||
| -rw-r--r-- | lib/crypto/c_src/crypto_callback.c | 2 |
2 files changed, 15 insertions, 4 deletions
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c index 6642183cb8..e55a03d26a 100644 --- a/lib/crypto/c_src/crypto.c +++ b/lib/crypto/c_src/crypto.c @@ -507,6 +507,15 @@ static int init_ose_crypto() { #endif #ifdef HAVE_DYNAMIC_CRYPTO_LIB + +# if defined(DEBUG) +static char crypto_callback_name[] = "crypto_callback.debug"; +# elif defined(VALGRIND) +static char crypto_callback_name[] = "crypto_callback.valgrind"; +# else +static char crypto_callback_name[] = "crypto_callback"; +# endif + static int change_basename(ErlNifBinary* bin, char* buf, int bufsz, const char* newfile) { int i; @@ -613,7 +622,7 @@ static int init(ErlNifEnv* env, ERL_NIF_TERM load_info) #ifdef HAVE_DYNAMIC_CRYPTO_LIB { void* handle; - if (!change_basename(&lib_bin, lib_buf, sizeof(lib_buf), "crypto_callback")) { + if (!change_basename(&lib_bin, lib_buf, sizeof(lib_buf), crypto_callback_name)) { return 0; } if (!(handle = enif_dlopen(lib_buf, &error_handler, NULL))) { @@ -3244,6 +3253,7 @@ out: if (bn_order) BN_free(bn_order); if (cofactor) BN_free(cofactor); if (group) EC_GROUP_free(group); + if (point) EC_POINT_free(point); return key; } @@ -3406,8 +3416,11 @@ static ERL_NIF_TERM ec_key_generate(ErlNifEnv* env, int argc, const ERL_NIF_TERM EC_KEY_free(key); return enif_make_tuple2(env, pub_key, priv_key); } - else + else { + if (key) + EC_KEY_free(key); return enif_make_badarg(env); + } #else return atom_notsup; #endif diff --git a/lib/crypto/c_src/crypto_callback.c b/lib/crypto/c_src/crypto_callback.c index a08dcec463..b4c175ae43 100644 --- a/lib/crypto/c_src/crypto_callback.c +++ b/lib/crypto/c_src/crypto_callback.c @@ -107,8 +107,6 @@ static INLINE void locking(int mode, ErlNifRWLock* lock) static void locking_function(int mode, int n, const char *file, int line) { - ASSERT(n>=0 && n<CRYPTO_num_locks()); - locking(mode, lock_vec[n]); } |