diff options
Diffstat (limited to 'lib/crypto')
-rw-r--r-- | lib/crypto/c_src/cipher.c | 2 | ||||
-rw-r--r-- | lib/crypto/c_src/hash.c | 2 | ||||
-rw-r--r-- | lib/crypto/c_src/otp_test_engine.c | 4 | ||||
-rw-r--r-- | lib/crypto/doc/src/engine_keys.xml | 2 |
4 files changed, 8 insertions, 2 deletions
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[]) 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) diff --git a/lib/crypto/doc/src/engine_keys.xml b/lib/crypto/doc/src/engine_keys.xml index b28606fb4e..f78bb81bba 100644 --- a/lib/crypto/doc/src/engine_keys.xml +++ b/lib/crypto/doc/src/engine_keys.xml @@ -51,7 +51,7 @@ <p> OTP/Crypto requires that the user provides two or three items of information about the key. The application used by the user is usually on a higher level, for example in - <seealso marker="ssl:ssl#key_option_def">SSL</seealso>. If using + <seealso marker="ssl:ssl#type-key">SSL</seealso>. If using the crypto application directly, it is required that: </p> <list> |