Fix source where indent will not be able to cope

Conflicts:
	apps/ciphers.c
	ssl/s3_pkt.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Matt Caswell
2015-01-19 12:42:01 +00:00
parent c695ebe2a0
commit bc2d623c0e
16 changed files with 1472 additions and 561 deletions

View File

@@ -1045,6 +1045,7 @@ int tls1_mac(SSL *ssl, unsigned char *md, int send)
* timing-side channel information about how many blocks of
* data we are hashing because that gives an attacker a
* timing-oracle. */
/* Final param == not SSLv3 */
ssl3_cbc_digest_record(
mac_ctx,
md, &md_size,
@@ -1052,7 +1053,7 @@ int tls1_mac(SSL *ssl, unsigned char *md, int send)
rec->length + md_size, orig_len,
ssl->s3->read_mac_secret,
ssl->s3->read_mac_secret_size,
0 /* not SSLv3 */);
0);
}
else
{