diff options
Diffstat (limited to 'src/lib/libcrypto/ecdsa/ecs_lib.c')
| -rw-r--r-- | src/lib/libcrypto/ecdsa/ecs_lib.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/lib/libcrypto/ecdsa/ecs_lib.c b/src/lib/libcrypto/ecdsa/ecs_lib.c index 814a6bf404..7b53969ffd 100644 --- a/src/lib/libcrypto/ecdsa/ecs_lib.c +++ b/src/lib/libcrypto/ecdsa/ecs_lib.c | |||
| @@ -60,9 +60,6 @@ | |||
| 60 | #endif | 60 | #endif |
| 61 | #include <openssl/err.h> | 61 | #include <openssl/err.h> |
| 62 | #include <openssl/bn.h> | 62 | #include <openssl/bn.h> |
| 63 | #ifdef OPENSSL_FIPS | ||
| 64 | #include <openssl/fips.h> | ||
| 65 | #endif | ||
| 66 | 63 | ||
| 67 | const char ECDSA_version[]="ECDSA" OPENSSL_VERSION_PTEXT; | 64 | const char ECDSA_version[]="ECDSA" OPENSSL_VERSION_PTEXT; |
| 68 | 65 | ||
| @@ -81,14 +78,7 @@ const ECDSA_METHOD *ECDSA_get_default_method(void) | |||
| 81 | { | 78 | { |
| 82 | if(!default_ECDSA_method) | 79 | if(!default_ECDSA_method) |
| 83 | { | 80 | { |
| 84 | #ifdef OPENSSL_FIPS | ||
| 85 | if (FIPS_mode()) | ||
| 86 | return FIPS_ecdsa_openssl(); | ||
| 87 | else | ||
| 88 | return ECDSA_OpenSSL(); | ||
| 89 | #else | ||
| 90 | default_ECDSA_method = ECDSA_OpenSSL(); | 81 | default_ECDSA_method = ECDSA_OpenSSL(); |
| 91 | #endif | ||
| 92 | } | 82 | } |
| 93 | return default_ECDSA_method; | 83 | return default_ECDSA_method; |
| 94 | } | 84 | } |
| @@ -212,14 +202,6 @@ ECDSA_DATA *ecdsa_check(EC_KEY *key) | |||
| 212 | } | 202 | } |
| 213 | else | 203 | else |
| 214 | ecdsa_data = (ECDSA_DATA *)data; | 204 | ecdsa_data = (ECDSA_DATA *)data; |
| 215 | #ifdef OPENSSL_FIPS | ||
| 216 | if (FIPS_mode() && !(ecdsa_data->flags & ECDSA_FLAG_FIPS_METHOD) | ||
| 217 | && !(EC_KEY_get_flags(key) & EC_FLAG_NON_FIPS_ALLOW)) | ||
| 218 | { | ||
| 219 | ECDSAerr(ECDSA_F_ECDSA_CHECK, ECDSA_R_NON_FIPS_METHOD); | ||
| 220 | return NULL; | ||
| 221 | } | ||
| 222 | #endif | ||
| 223 | 205 | ||
| 224 | return ecdsa_data; | 206 | return ecdsa_data; |
| 225 | } | 207 | } |
