generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Manually reformat aes_x86core.c and add it to the list of files skipped by

Browse Source 
openssl-format-source

Conflicts:
	crypto/aes/aes_x86core.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Matt Caswell 2015-01-21 16:34:27 +00:00
parent 2655f5644d
commit 72d7ed66e2
2 changed files with 520 additions and 513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crypto/aes/aes_x86core.c
View File

@ -468,7 +468,8 @@ static const u32 rcon[] = {
* Expand the cipher key into the encryption key schedule. * Expand the cipher key into the encryption key schedule.
*/ */
int AES_set_encrypt_key(const unsigned char *userKey, const int bits, int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
AES_KEY *key) { AES_KEY *key)
{
u32 *rk; u32 *rk;
int i = 0; int i = 0;
@ -569,7 +570,8 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
* Expand the cipher key into the decryption key schedule. * Expand the cipher key into the decryption key schedule.
*/ */
int AES_set_decrypt_key(const unsigned char *userKey, const int bits, int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
AES_KEY *key) { AES_KEY *key)
{
u32 *rk; u32 *rk;
int i, j, status; int i, j, status;
@ -650,7 +652,8 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
* in and out can overlap * in and out can overlap
*/ */
void AES_encrypt(const unsigned char *in, unsigned char *out, void AES_encrypt(const unsigned char *in, unsigned char *out,
const AES_KEY *key) { const AES_KEY *key)
{
const u32 *rk; const u32 *rk;
u32 s0, s1, s2, s3, t[4]; u32 s0, s1, s2, s3, t[4];
@ -755,7 +758,8 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
Te4[(s2 >> 24) ] << 24; Te4[(s2 >> 24) ] << 24;
/* now do the linear transform using words */ /* now do the linear transform using words */
{ int i; {
int i;
u32 r0, r1, r2; u32 r0, r1, r2;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -862,7 +866,8 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
* in and out can overlap * in and out can overlap
*/ */
void AES_decrypt(const unsigned char *in, unsigned char *out, void AES_decrypt(const unsigned char *in, unsigned char *out,
const AES_KEY *key) { const AES_KEY *key)
{
const u32 *rk; const u32 *rk;
u32 s0, s1, s2, s3, t[4]; u32 s0, s1, s2, s3, t[4];
@ -901,7 +906,8 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
Td4[(s0 >> 24) ] << 24; Td4[(s0 >> 24) ] << 24;
/* now do the linear transform using words */ /* now do the linear transform using words */
{ int i; {
int i;
u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m; u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -977,7 +983,8 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
Td4[(s0 >> 24) ] << 24; Td4[(s0 >> 24) ] << 24;
/* now do the linear transform using words */ /* now do the linear transform using words */
{ int i; {
int i;
u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m; u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {

2
util/openssl-format-source
View File

@ -88,7 +88,7 @@ do
case `basename $j` in case `basename $j` in
# the list of files that indent is unable to handle correctly # the list of files that indent is unable to handle correctly
# that we simply leave alone for manual formatting now # that we simply leave alone for manual formatting now
obj_dat.h|aes_core.c) obj_dat.h|aes_core.c|aes_x86core.c)
echo "skipping $j" echo "skipping $j"
;; ;;
*) *)