Commit 87402d4c authored by Cristian Stoica's avatar Cristian Stoica Committed by Matt Caswell
Browse files

merge two mutual exclusive #ifdefs to improve clarity 



CLA: trivial

Signed-off-by: default avatarCristian Stoica <cristian.stoica@nxp.com>

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1449)
parent a3d684ff

engines/ccgost/gost_eng.c

+3 −4
Original line number Diff line number Diff line
@@ -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