diff options
author | Matt Caswell <matt@openssl.org> | 2015-01-21 19:18:47 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:28:49 +0000 |
commit | f3b6ee30f4995d74f1008ffbe10e1b59caaffcaa (patch) | |
tree | 5cc4242eebf67aff6d3c67785b61876d52833ea4 /crypto/evp | |
parent | a1b20ff65456696e6e4ce6dccb276ef63f54e1e9 (diff) |
Move more comments that confuse indent
Conflicts:
crypto/dsa/dsa.h
demos/engines/ibmca/hw_ibmca.c
ssl/ssl_locl.h
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/evp')
-rw-r--r-- | crypto/evp/e_aes_cbc_hmac_sha1.c | 6 | ||||
-rw-r--r-- | crypto/evp/e_aes_cbc_hmac_sha256.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c index ec76393576..3e41f5d419 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha1.c +++ b/crypto/evp/e_aes_cbc_hmac_sha1.c @@ -212,7 +212,8 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *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 = (SHA1_MB_CTX *)(storage+32-((size_t)storage%32)); /* align */ @@ -229,7 +230,8 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key, /* populate descriptors with pointers and IVs */ hash_d[0].ptr = inp; ciph_d[0].inp = inp; - ciph_d[0].out = out+5+16; /* 5+16 is place for header and explicit IV */ + /* 5+16 is place for header and explicit IV */ + ciph_d[0].out = out+5+16; memcpy(ciph_d[0].out-16,IVs,16); memcpy(ciph_d[0].iv,IVs,16); IVs += 16; diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c index 752004703c..448878b0b2 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha256.c +++ b/crypto/evp/e_aes_cbc_hmac_sha256.c @@ -227,7 +227,8 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key, /* populate descriptors with pointers and IVs */ hash_d[0].ptr = inp; ciph_d[0].inp = inp; - ciph_d[0].out = out+5+16; /* 5+16 is place for header and explicit IV */ + /* 5+16 is place for header and explicit IV */ + ciph_d[0].out = out+5+16; memcpy(ciph_d[0].out-16,IVs,16); memcpy(ciph_d[0].iv,IVs,16); IVs += 16; |