diff options
| author | Ben Laurie <ben@links.org> | 2013-01-30 16:56:30 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-02-05 16:50:33 +0000 |
| commit | 2928cb4c82d6516d9e65ede4901a5957d8c39c32 (patch) | |
| tree | ed17442f124163ffa87c516bdbd0ed1d293d7c36 /ssl/s3_cbc.c | |
| parent | a33e6702a0db1b9f4648d247b8b28a5c0e42ca13 (diff) | |
Fixups.
Diffstat (limited to 'ssl/s3_cbc.c')
| -rw-r--r-- | ssl/s3_cbc.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c index e9b112c1b5..a29ff66b79 100644 --- a/ssl/s3_cbc.c +++ b/ssl/s3_cbc.c @@ -139,8 +139,7 @@ int tls1_cbc_remove_padding(const SSL* s, unsigned mac_size) { unsigned padding_length, good, to_check, i; - const char has_explicit_iv = - s->version >= TLS1_1_VERSION || s->version == DTLS1_VERSION; + const char has_explicit_iv = s->version == DTLS1_VERSION; const unsigned overhead = 1 /* padding length byte */ + mac_size + (has_explicit_iv ? block_size : 0); @@ -366,9 +365,9 @@ static void tls1_sha512_final_raw(void* ctx, unsigned char *md_out) /* ssl3_cbc_record_digest_supported returns 1 iff |ctx| uses a hash function * which ssl3_cbc_digest_record supports. */ -char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx) +char ssl3_cbc_record_digest_supported(const EVP_MD *digest) { - switch (ctx->digest->type) + switch (digest->type) { case NID_md5: case NID_sha1: @@ -402,7 +401,7 @@ char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx) * a padding byte and MAC. (If the padding was invalid, it might contain the * padding too. ) */ void ssl3_cbc_digest_record( - const EVP_MD_CTX *ctx, + const EVP_MD *digest, unsigned char* md_out, size_t* md_out_size, const unsigned char header[13], @@ -436,7 +435,7 @@ void ssl3_cbc_digest_record( * many possible overflows later in this function. */ OPENSSL_assert(data_plus_mac_plus_padding_size < 1024*1024); - switch (ctx->digest->type) + switch (digest->type) { case NID_md5: MD5_Init((MD5_CTX*)md_state); @@ -670,7 +669,7 @@ void ssl3_cbc_digest_record( } EVP_MD_CTX_init(&md_ctx); - EVP_DigestInit_ex(&md_ctx, ctx->digest, NULL /* engine */); + EVP_DigestInit_ex(&md_ctx, digest, NULL /* engine */); if (is_sslv3) { /* We repurpose |hmac_pad| to contain the SSLv3 pad2 block. */ |