diff options
| author | Alex Chernyakhovsky <achernya@google.com> | 2014-08-03 23:13:11 +0400 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-08-05 00:13:54 +0400 |
| commit | 499b4401353b21d432fb67420e0a3a4b1dfb2844 (patch) | |
| tree | 5a54490586dc6ed310ccb85f937aaaae967f4f49 /ssl/s3_cbc.c | |
| parent | 69877b61195198f0e4ae9fcabc53111915bed2b2 (diff) | |
Remove OPENSSL_NO_SHA512
Changes were made by running
find . -type f -name *.c | xargs unifdef -m -U OPENSSL_NO_SHA512
find . -type f -name *.h | xargs unifdef -m -U OPENSSL_NO_SHA512
Change-Id: I5c8a89384c865423aa7b549470068ef18161bce4
Reviewed-on: https://boringssl-review.googlesource.com/1379
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'ssl/s3_cbc.c')
| -rw-r--r-- | ssl/s3_cbc.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c index f56f3985..e80734e6 100644 --- a/ssl/s3_cbc.c +++ b/ssl/s3_cbc.c @@ -367,7 +367,6 @@ static void tls1_sha256_final_raw(void* ctx, unsigned char *md_out) #undef LARGEST_DIGEST_CTX #define LARGEST_DIGEST_CTX SHA256_CTX -#ifndef OPENSSL_NO_SHA512 static void tls1_sha512_final_raw(void* ctx, unsigned char *md_out) { SHA512_CTX *sha512 = ctx; @@ -380,7 +379,6 @@ static void tls1_sha512_final_raw(void* ctx, unsigned char *md_out) } #undef LARGEST_DIGEST_CTX #define LARGEST_DIGEST_CTX SHA512_CTX -#endif /* ssl3_cbc_record_digest_supported returns 1 iff |ctx| uses a hash function * which ssl3_cbc_digest_record supports. */ @@ -392,10 +390,8 @@ char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx) case NID_sha1: case NID_sha224: case NID_sha256: -#ifndef OPENSSL_NO_SHA512 case NID_sha384: case NID_sha512: -#endif return 1; default: return 0; @@ -486,7 +482,6 @@ void ssl3_cbc_digest_record( md_transform = (void(*)(void *ctx, const unsigned char *block)) SHA256_Transform; md_size = 32; break; -#ifndef OPENSSL_NO_SHA512 case NID_sha384: SHA384_Init((SHA512_CTX*)md_state.c); md_final_raw = tls1_sha512_final_raw; @@ -503,7 +498,6 @@ void ssl3_cbc_digest_record( md_block_size = 128; md_length_size = 16; break; -#endif default: /* ssl3_cbc_record_digest_supported should have been * called first to check that the hash function is |