diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-10-18 20:14:36 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-12-08 13:18:43 +0000 |
| commit | 00b4ee7664051a0dc589b1d81ba56582576a6ca4 (patch) | |
| tree | e5892e49b7d50a00c580a749eb3b9985d4e5ee3d /ssl/s3_cbc.c | |
| parent | 0c1bd7f03fcd1cc8256f89f4962d91b78432c74a (diff) | |
Remove some unnecessary OPENSSL_FIPS references
FIPS_mode() exists in all versions of OpenSSL but always returns 0 if OpenSSL is not FIPS
capable.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl/s3_cbc.c')
| -rw-r--r-- | ssl/s3_cbc.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c index 27f309e72d..6087ee3553 100644 --- a/ssl/s3_cbc.c +++ b/ssl/s3_cbc.c @@ -353,10 +353,8 @@ static void tls1_sha512_final_raw(void* ctx, unsigned char *md_out) * which ssl3_cbc_digest_record supports. */ char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx) { -#ifdef OPENSSL_FIPS if (FIPS_mode()) return 0; -#endif switch (EVP_MD_CTX_type(ctx)) { case NID_md5: @@ -705,8 +703,6 @@ void ssl3_cbc_digest_record( EVP_MD_CTX_cleanup(&md_ctx); } -#ifdef OPENSSL_FIPS - /* Due to the need to use EVP in FIPS mode we can't reimplement digests but * we can ensure the number of blocks processed is equal for all cases * by digesting additional data. @@ -750,4 +746,3 @@ void tls_fips_digest_extra( EVP_DigestSignUpdate(mac_ctx, data, (blocks_orig - blocks_data + 1) * block_size); } -#endif |