merge two mutual exclusive #ifdefs to improve clarity
authorCristian Stoica <cristian.stoica@nxp.com>
Fri, 12 Aug 2016 14:53:25 +0000 (17:53 +0300)
committerMatt Caswell <matt@openssl.org>
Tue, 23 Jan 2018 18:17:21 +0000 (18:17 +0000)
CLA: trivial

Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1449)

engines/ccgost/gost_eng.c

index 5924791b7735d35ff7ab1e97b3fc608e3cfb4f3a..ea52c4dbe9db00bbe61514908db9dfedb5526fb2 100644 (file)
@@ -157,10 +157,6 @@ static int bind_gost(ENGINE *e, const char *id)
     return ret;
 }
 
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
-IMPLEMENT_DYNAMIC_BIND_FN(bind_gost)
-    IMPLEMENT_DYNAMIC_CHECK_FN()
-#endif                          /* ndef OPENSSL_NO_DYNAMIC_ENGINE */
 static int gost_digests(ENGINE *e, const EVP_MD **digest,
                         const int **nids, int nid)
 {
@@ -278,4 +274,7 @@ void ENGINE_load_gost(void)
     ENGINE_free(toadd);
     ERR_clear_error();
 }
+#else
+IMPLEMENT_DYNAMIC_BIND_FN(bind_gost)
+IMPLEMENT_DYNAMIC_CHECK_FN()
 #endif