diff options
Diffstat (limited to 'src/lib/libcrypto/ec/ecp_nist.c')
| -rw-r--r-- | src/lib/libcrypto/ec/ecp_nist.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/lib/libcrypto/ec/ecp_nist.c b/src/lib/libcrypto/ec/ecp_nist.c index aad2d5f443..2a5682ea41 100644 --- a/src/lib/libcrypto/ec/ecp_nist.c +++ b/src/lib/libcrypto/ec/ecp_nist.c | |||
| @@ -67,17 +67,9 @@ | |||
| 67 | #include <openssl/obj_mac.h> | 67 | #include <openssl/obj_mac.h> |
| 68 | #include "ec_lcl.h" | 68 | #include "ec_lcl.h" |
| 69 | 69 | ||
| 70 | #ifdef OPENSSL_FIPS | ||
| 71 | #include <openssl/fips.h> | ||
| 72 | #endif | ||
| 73 | |||
| 74 | const EC_METHOD *EC_GFp_nist_method(void) | 70 | const EC_METHOD *EC_GFp_nist_method(void) |
| 75 | { | 71 | { |
| 76 | #ifdef OPENSSL_FIPS | ||
| 77 | return fips_ec_gfp_nist_method(); | ||
| 78 | #else | ||
| 79 | static const EC_METHOD ret = { | 72 | static const EC_METHOD ret = { |
| 80 | EC_FLAGS_DEFAULT_OCT, | ||
| 81 | NID_X9_62_prime_field, | 73 | NID_X9_62_prime_field, |
| 82 | ec_GFp_simple_group_init, | 74 | ec_GFp_simple_group_init, |
| 83 | ec_GFp_simple_group_finish, | 75 | ec_GFp_simple_group_finish, |
| @@ -96,7 +88,9 @@ const EC_METHOD *EC_GFp_nist_method(void) | |||
| 96 | ec_GFp_simple_get_Jprojective_coordinates_GFp, | 88 | ec_GFp_simple_get_Jprojective_coordinates_GFp, |
| 97 | ec_GFp_simple_point_set_affine_coordinates, | 89 | ec_GFp_simple_point_set_affine_coordinates, |
| 98 | ec_GFp_simple_point_get_affine_coordinates, | 90 | ec_GFp_simple_point_get_affine_coordinates, |
| 99 | 0,0,0, | 91 | ec_GFp_simple_set_compressed_coordinates, |
| 92 | ec_GFp_simple_point2oct, | ||
| 93 | ec_GFp_simple_oct2point, | ||
| 100 | ec_GFp_simple_add, | 94 | ec_GFp_simple_add, |
| 101 | ec_GFp_simple_dbl, | 95 | ec_GFp_simple_dbl, |
| 102 | ec_GFp_simple_invert, | 96 | ec_GFp_simple_invert, |
| @@ -116,7 +110,6 @@ const EC_METHOD *EC_GFp_nist_method(void) | |||
| 116 | 0 /* field_set_to_one */ }; | 110 | 0 /* field_set_to_one */ }; |
| 117 | 111 | ||
| 118 | return &ret; | 112 | return &ret; |
| 119 | #endif | ||
| 120 | } | 113 | } |
| 121 | 114 | ||
| 122 | int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src) | 115 | int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src) |
