From 55d6161c8025a07e1775b1ac1f2fee56fe38770d Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Fri, 1 Feb 2019 10:07:22 +0100 Subject: crypto: Fix compilation < 1.0.0 --- lib/crypto/c_src/cipher.c | 2 ++ lib/crypto/c_src/hash.c | 2 ++ 2 files changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/crypto/c_src/cipher.c b/lib/crypto/c_src/cipher.c index 5d306b80dd..449e636037 100644 --- a/lib/crypto/c_src/cipher.c +++ b/lib/crypto/c_src/cipher.c @@ -94,9 +94,11 @@ int init_cipher_ctx(ErlNifEnv *env) { return 1; +#ifdef HAVE_EVP_AES_CTR err: PRINTF_ERR0("CRYPTO: Could not open resource type 'EVP_CIPHER_CTX'"); return 0; +#endif } void init_cipher_types(ErlNifEnv* env) diff --git a/lib/crypto/c_src/hash.c b/lib/crypto/c_src/hash.c index d67e68f857..457e9d071a 100644 --- a/lib/crypto/c_src/hash.c +++ b/lib/crypto/c_src/hash.c @@ -54,9 +54,11 @@ int init_hash_ctx(ErlNifEnv* env) { return 1; +#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0) err: PRINTF_ERR0("CRYPTO: Could not open resource type 'EVP_MD_CTX'"); return 0; +#endif } ERL_NIF_TERM hash_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) -- cgit v1.2.3 From 0c441ec09fa648af869e6080f671dee802d62e3d Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Thu, 17 Jan 2019 13:49:28 +0100 Subject: otp_test_engine.c fixes --- lib/crypto/c_src/otp_test_engine.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/crypto/c_src/otp_test_engine.c b/lib/crypto/c_src/otp_test_engine.c index fdc60f3bbc..fd26b7cb5d 100644 --- a/lib/crypto/c_src/otp_test_engine.c +++ b/lib/crypto/c_src/otp_test_engine.c @@ -104,9 +104,11 @@ static int test_init(ENGINE *e) { return 111; - err: +#if defined(FAKE_RSA_IMPL) +err: fprintf(stderr, "Setup RSA_METHOD failed\r\n"); return 0; +#endif } static void add_test_data(unsigned char *md, unsigned int len) -- cgit v1.2.3