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:26:58 +0000 |
| commit | cc6e2a5936623a3055211f98c987fde62b6a16a6 (patch) | |
| tree | a4b5fb4b140213f9eebb65ae804788a793fb075c /crypto/evp | |
| parent | 85b120f36148cdbf8d3ae1605476cb4f9434769b (diff) | |
Fix strange formatting by indent
Conflicts:
crypto/hmac/hmac.h
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/e_aes_cbc_hmac_sha256.c | 6 | ||||
| -rw-r--r-- | crypto/evp/e_des3.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c index 988770a31b..752004703c 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha256.c +++ b/crypto/evp/e_aes_cbc_hmac_sha256.c @@ -208,10 +208,12 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key, u64 seqnum; #endif - if (RAND_bytes((IVs=blocks[0].c),16*x4)<=0) /* ask for IVs in bulk */ + /* ask for IVs in bulk */ + if (RAND_bytes((IVs=blocks[0].c),16*x4)<=0) return 0; - ctx = (SHA256_MB_CTX *)(storage+32-((size_t)storage%32)); /* align */ + /* align */ + ctx = (SHA256_MB_CTX *)(storage+32-((size_t)storage%32)); frag = (unsigned int)inp_len>>(1+n4x); last = (unsigned int)inp_len+frag-(frag<<(1+n4x)); diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c index ad7be6b639..4275373fd2 100644 --- a/crypto/evp/e_des3.c +++ b/crypto/evp/e_des3.c @@ -210,8 +210,8 @@ static int des_ede3_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, DES_ede3_cfb_encrypt(c,d,1,1, &data(ctx)->ks1,&data(ctx)->ks2,&data(ctx)->ks3, (DES_cblock *)ctx->iv,ctx->encrypt); - out[n/8]=(out[n/8]&~(0x80 >> (unsigned int)(n%8))) | - ((d[0]&0x80) >> (unsigned int)(n%8)); + out[n/8]=(out[n/8]&~(0x80 >> (unsigned int)(n%8))) + | ((d[0]&0x80) >> (unsigned int)(n%8)); } return 1; |