diff options
| author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-06-28 22:51:01 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-06-29 09:56:39 -0400 |
| commit | 02e112a88579ff2592f34015f73dc85f4ed76ad5 (patch) | |
| tree | e99d5fa28c3dbc7b35eda5bce012dd57f6d86267 /crypto/aes | |
| parent | 0517ffc47c79136ba09fb34400e9e26c539615d1 (diff) | |
Whitespace cleanup in crypto
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1264)
Diffstat (limited to 'crypto/aes')
| -rw-r--r-- | crypto/aes/aes_core.c | 2 | ||||
| -rw-r--r-- | crypto/aes/aes_x86core.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c index ef0fc51d95..69be3d85c7 100644 --- a/crypto/aes/aes_core.c +++ b/crypto/aes/aes_core.c @@ -1355,7 +1355,7 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits, rk[j] = tpe ^ ROTATE(tpd,16) ^ ROTATE(tp9,24) ^ ROTATE(tpb,8); #else - rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ + rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ (tp9 >> 8) ^ (tp9 << 24) ^ (tpb >> 24) ^ (tpb << 8); #endif diff --git a/crypto/aes/aes_x86core.c b/crypto/aes/aes_x86core.c index dd7e905470..95b49bbabc 100644 --- a/crypto/aes/aes_x86core.c +++ b/crypto/aes/aes_x86core.c @@ -621,7 +621,7 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits, rk[j] = tpe ^ ROTATE(tpd,16) ^ ROTATE(tp9,8) ^ ROTATE(tpb,24); #else - rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ + rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ (tp9 >> 24) ^ (tp9 << 8) ^ (tpb >> 8) ^ (tpb << 24); #endif @@ -910,7 +910,7 @@ void AES_decrypt(const unsigned char *in, unsigned char *out, (u32)Td4[(s1 >> 16) & 0xff] << 16 ^ (u32)Td4[(s0 >> 24) ] << 24; - /* now do the linear transform using words */ + /* now do the linear transform using words */ { int i; u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m; @@ -934,7 +934,7 @@ void AES_decrypt(const unsigned char *in, unsigned char *out, t[i] = tpe ^ ROTATE(tpd,16) ^ ROTATE(tp9,8) ^ ROTATE(tpb,24); #else - t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ + t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ (tp9 >> 24) ^ (tp9 << 8) ^ (tpb >> 8) ^ (tpb << 24); #endif @@ -987,7 +987,7 @@ void AES_decrypt(const unsigned char *in, unsigned char *out, (u32)Td4[(s1 >> 16) & 0xff] << 16 ^ (u32)Td4[(s0 >> 24) ] << 24; - /* now do the linear transform using words */ + /* now do the linear transform using words */ { int i; u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m; @@ -1011,7 +1011,7 @@ void AES_decrypt(const unsigned char *in, unsigned char *out, t[i] = tpe ^ ROTATE(tpd,16) ^ ROTATE(tp9,8) ^ ROTATE(tpb,24); #else - t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ + t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ (tp9 >> 24) ^ (tp9 << 8) ^ (tpb >> 8) ^ (tpb << 24); #endif |