resolve conflicts

1 files changed, 4 insertions, 4 deletions

diff --git a/src/lib/libcrypto/bn/bntest.c b/src/lib/libcrypto/bn/bntest.c
index 0cd99c5b4b..06f5954acc 100644
--- a/src/lib/libcrypto/bn/bntest.c
+++ b/src/lib/libcrypto/bn/bntest.c
@@ -262,7 +262,7 @@ int main(int argc, char *argv[])
         message(out,"BN_mod_sqrt");
         if (!test_sqrt(out,ctx)) goto err;
         (void)BIO_flush(out);
-
+#ifndef OPENSSL_NO_EC2M
         message(out,"BN_GF2m_add");
         if (!test_gf2m_add(out)) goto err;
         (void)BIO_flush(out);
@@ -298,7 +298,7 @@ int main(int argc, char *argv[])
         message(out,"BN_GF2m_mod_solve_quad");
         if (!test_gf2m_mod_solve_quad(out,ctx)) goto err;
         (void)BIO_flush(out);
-
+#endif
         BN_CTX_free(ctx);
         BIO_free(out);
 
@@ -1061,7 +1061,7 @@ int test_exp(BIO *bp, BN_CTX *ctx)
         BN_free(one);
         return(1);
         }
-
+#ifndef OPENSSL_NO_EC2M
 int test_gf2m_add(BIO *bp)
         {
         BIGNUM a,b,c;
@@ -1636,7 +1636,7 @@ int test_gf2m_mod_solve_quad(BIO *bp,BN_CTX *ctx)
         BN_free(e);
         return ret;
         }
-
+#endif
 static int genprime_cb(int p, int n, BN_GENCB *arg)
         {
         char c='*';