Merge branch 'hans/crypto/use_openssl_NO-flags/OTP-15683'

* hans/crypto/use_openssl_NO-flags/OTP-15683:
  crypto: Fixup unused label warning
  crypto: Fixup 'break strict-aliasing rules' warning
  crypto: Fixup 'break strict-aliasing rules' warning
  crypto: Fixup the ripemd160 macro chaos
  crypto: Test suite fix for unavailable CMAC
  crypto: Handle additional OPENSSL_NO_* flags

1 files changed, 4 insertions, 6 deletions

diff --git a/lib/crypto/c_src/engine.c b/lib/crypto/c_src/engine.c
index 7ffbb9e70d..ea5d9a588f 100644
--- a/lib/crypto/c_src/engine.c
+++ b/lib/crypto/c_src/engine.c
@@ -106,15 +106,13 @@ int init_engine_ctx(ErlNifEnv *env) {
                                                    (ErlNifResourceDtor*) engine_ctx_dtor,
                                                    ERL_NIF_RT_CREATE|ERL_NIF_RT_TAKEOVER,
                                                    NULL);
-    if (engine_ctx_rtype == NULL)
-        goto err;
+    if (engine_ctx_rtype == NULL) {
+        PRINTF_ERR0("CRYPTO: Could not open resource type 'ENGINE_CTX'");
+        return 0;
+    }
 #endif
 
     return 1;
-
- err:
-    PRINTF_ERR0("CRYPTO: Could not open resource type 'ENGINE_CTX'");
-    return 0;
 }
 
 ERL_NIF_TERM engine_by_id_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])