resolve conflicts

1 files changed, 11 insertions, 3 deletions

diff --git a/src/lib/libcrypto/ec/ecp_mont.c b/src/lib/libcrypto/ec/ecp_mont.c
index 9fc4a466a5..079e47431b 100644
--- a/src/lib/libcrypto/ec/ecp_mont.c
+++ b/src/lib/libcrypto/ec/ecp_mont.c
@@ -63,12 +63,20 @@
 
 #include <openssl/err.h>
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 #include "ec_lcl.h"
 
 
 const EC_METHOD *EC_GFp_mont_method(void)
         {
+#ifdef OPENSSL_FIPS
+        return fips_ec_gfp_mont_method();
+#else
         static const EC_METHOD ret = {
+                EC_FLAGS_DEFAULT_OCT,
                 NID_X9_62_prime_field,
                 ec_GFp_mont_group_init,
                 ec_GFp_mont_group_finish,
@@ -87,9 +95,7 @@ const EC_METHOD *EC_GFp_mont_method(void)
                 ec_GFp_simple_get_Jprojective_coordinates_GFp,
                 ec_GFp_simple_point_set_affine_coordinates,
                 ec_GFp_simple_point_get_affine_coordinates,
-                ec_GFp_simple_set_compressed_coordinates,
-                ec_GFp_simple_point2oct,
-                ec_GFp_simple_oct2point,
+                0,0,0,
                 ec_GFp_simple_add,
                 ec_GFp_simple_dbl,
                 ec_GFp_simple_invert,
@@ -108,7 +114,9 @@ const EC_METHOD *EC_GFp_mont_method(void)
                 ec_GFp_mont_field_decode,
                 ec_GFp_mont_field_set_to_one };
 
+
         return &ret;
+#endif
         }