diff options
| author | Sverker Eriksson <[email protected]> | 2015-12-10 18:16:08 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-12-10 18:16:08 +0100 |
| commit | b249e54412fe1be63549b1cb9eee5d632df0fd64 (patch) | |
| tree | 8937093b14553b445619c66cb9381fc4c2115e20 /lib/crypto/c_src/crypto_callback.c | |
| parent | 87c47e0d9883e09cfd2b862ab3953108d93cd82a (diff) | |
| parent | 162d8cdb1ee5efc990abe62a55f8cbff94e48351 (diff) | |
| download | otp-b249e54412fe1be63549b1cb9eee5d632df0fd64.tar.gz otp-b249e54412fe1be63549b1cb9eee5d632df0fd64.tar.bz2 otp-b249e54412fe1be63549b1cb9eee5d632df0fd64.zip | |
Merge branch 'sverk/crypto-evp-master'
OTP-12217
* sverk/crypto-evp-master:
crypto: Avoid bug in OpenSSL-0.9.8 for ECB ciphers
Fix EVP_aes_???_ctr to demand OpenSSL 1.0.1 or later.
Fix bug for aes_cfb_128_encrypt with empty binary
crypto: Refactor nif code to use EVP interface
Diffstat (limited to 'lib/crypto/c_src/crypto_callback.c')
| -rw-r--r-- | lib/crypto/c_src/crypto_callback.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/crypto/c_src/crypto_callback.c b/lib/crypto/c_src/crypto_callback.c index e0de16074c..aab43232c9 100644 --- a/lib/crypto/c_src/crypto_callback.c +++ b/lib/crypto/c_src/crypto_callback.c @@ -51,8 +51,6 @@ DLLEXPORT struct crypto_callbacks* get_crypto_callbacks(int nlocks); -static ErlNifRWLock** lock_vec = NULL; /* Static locks used by openssl */ - static void nomem(size_t size, const char* op) { fprintf(stderr, "Out of memory abort. Crypto failed to %s %zu bytes.\r\n", @@ -84,6 +82,8 @@ static void crypto_free(void* ptr) #ifdef OPENSSL_THREADS /* vvvvvvvvvvvvvvv OPENSSL_THREADS vvvvvvvvvvvvvvvv */ +static ErlNifRWLock** lock_vec = NULL; /* Static locks used by openssl */ + #include <openssl/crypto.h> static INLINE void locking(int mode, ErlNifRWLock* lock) |