diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-19 12:42:01 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:49:13 +0000 |
| commit | 00ea17f9d76aec3d7a44cff263e74291b6294ac9 (patch) | |
| tree | 76705fd033e07ab4273fc318f6d4a8eb6c70eeb8 /ssl/t1_enc.c | |
| parent | 3e8042c38f3a4be8933b0f773fd1e79f50e12e56 (diff) | |
Fix source where indent will not be able to cope
Conflicts:
apps/ciphers.c
ssl/s3_pkt.c
Conflicts:
crypto/ec/ec_curve.c
Conflicts:
crypto/ec/ec_curve.c
ssl/s3_clnt.c
ssl/s3_srvr.c
ssl/ssl_sess.c
Conflicts:
apps/ciphers.c
crypto/bn/bn.h
crypto/ec/ec_curve.c
ssl/t1_enc.c
ssl/t1_lib.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl/t1_enc.c')
| -rw-r--r-- | ssl/t1_enc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index b884957d49..a1df6af7d9 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -746,6 +746,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( hash, md, &md_size, @@ -753,7 +754,8 @@ int tls1_mac(SSL *ssl, unsigned char *md, int send) rec->length + md_size, orig_len, ssl->s3->read_mac_secret, EVP_MD_size(ssl->read_hash), - 0 /* not SSLv3 */); + /* not SSLv3 */ + 0); } else { |