diff options
| author | Cristian Stoica <cristian.stoica@nxp.com> | 2016-08-12 17:53:25 +0300 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-01-23 18:17:21 +0000 |
| commit | 87402d4ce31321a4d0345e566adc6b6e4f77645f (patch) | |
| tree | f0813461de433d2835389ab406d3ec2fcd69571c /engines | |
| parent | a3d684ffca282796511cb8f3593a59a80109eed8 (diff) | |
merge two mutual exclusive #ifdefs to improve clarity
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)
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/ccgost/gost_eng.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/ccgost/gost_eng.c b/engines/ccgost/gost_eng.c index 5924791b77..ea52c4dbe9 100644 --- a/engines/ccgost/gost_eng.c +++ b/engines/ccgost/gost_eng.c @@ -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 |