move ifdef statements

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/test/ecdhtest.c b/test/ecdhtest.c
index 0135f7b70508d0848a6d44ccf4958c94c02f1dca..3a67552b1ae315dca3f93a1e73e049dc2ae25b0d 100644 (file)
--- a/test/ecdhtest.c
+++ b/test/ecdhtest.c
@@ -497,8 +497,8 @@ static int ecdh_cavs_kat(BIO *out, const ecdh_cavs_kat_t *kat)
     if (is_char_two) {
 #ifndef OPENSSL_NO_EC2M
         if (!EC_POINT_set_affine_coordinates_GF2m(group, pub, x, y, NULL))
-#endif
             goto err;
+#endif
     }
     else {
         if (!EC_POINT_set_affine_coordinates_GFp(group, pub, x, y, NULL))
@@ -516,8 +516,8 @@ static int ecdh_cavs_kat(BIO *out, const ecdh_cavs_kat_t *kat)
     if (is_char_two) {
 #ifndef OPENSSL_NO_EC2M
         if (!EC_POINT_set_affine_coordinates_GF2m(group, pub, x, y, NULL))
-#endif
             goto err;
+#endif
     }
     else {
         if (!EC_POINT_set_affine_coordinates_GFp(group, pub, x, y, NULL))

diff --git a/test/ecdhtest_cavs.h b/test/ecdhtest_cavs.h
index 02621c6fb88affe1bce8b264d0ca197de2d3582b..0d700ed390579ae98f38de16650a4edef7492b02 100644 (file)
--- a/test/ecdhtest_cavs.h
+++ b/test/ecdhtest_cavs.h
@@ -4298,4 +4298,4 @@ static const ecdh_cavs_kat_t ecdh_cavs_kats[] = {
 #endif
 };
 
-#endif /* ECDHTEST_KAVS_H */
+#endif /* ECDHTEST_CAVS_H */