diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-21 12:19:08 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:44:08 +0000 |
| commit | 3ad5ae5d442f9f44f8263790d9cb23e782d9685a (patch) | |
| tree | cf26851aefa65308ad9fc4d8fe172a36516423fe /ssl | |
| parent | e16db4b3d75e9e3ea4dccdd5df65e75e62a320c3 (diff) | |
Fix strange formatting by indent
Conflicts:
crypto/hmac/hmac.h
Conflicts:
crypto/evp/e_aes_cbc_hmac_sha256.c
Conflicts:
crypto/ec/ecp_nistp224.c
crypto/ec/ecp_nistp256.c
crypto/ec/ecp_nistp521.c
crypto/ec/ectest.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl')
| -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 52808b32ca..6d8bc44b66 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -984,7 +984,8 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p, co = s->s3->client_opaque_prf_input; col = s->s3->server_opaque_prf_input_len; so = s->s3->server_opaque_prf_input; - sol = s->s3->client_opaque_prf_input_len; /* must be same as col (see draft-rescorla-tls-opaque-prf-input-00.txt, section 3.1) */ + /* must be same as col (see draft-rescorla-tls-opaque-prf-input-00.txt, section 3.1) */ + sol = s->s3->client_opaque_prf_input_len; } #endif |