From: Billy Brumley <bbrumley@gmail.com>
Date: Mon, 29 Feb 2016 19:01:47 +0000 (+0200)
Subject: move ifdef statements
X-Git-Tag: OpenSSL_1_1_0-pre4~321
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a67788c17eb906e442db65dfd292cb56cd55867c;p=openssl

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 0135f7b705..3a67552b1a 100644
--- 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 02621c6fb8..0d700ed390 100644
--- 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 */