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:33:54 +0000 |
| commit | 1566497495b30054453b05d275c01d6db5211e2a (patch) | |
| tree | a1d5537c54452e0bd4fefcb327d82acdbc2ddf82 /ssl/t1_enc.c | |
| parent | 712548231e101f11c06e729e2330a7f3155b2d7e (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
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl/t1_enc.c')
| -rw-r--r-- | ssl/t1_enc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 3c7391a70e..13623893aa 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -1022,6 +1022,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, @@ -1029,7 +1030,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 { |