Commit b10a8451 authored by Matt Caswell's avatar Matt Caswell
Browse files

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


openssl-format-source

Conflicts:
	crypto/aes/aes_x86core.c

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent 679fee0e

crypto/aes/aes_x86core.c

+519 −512
Original line number Diff line number Diff line
@@ -468,7 +468,8 @@ static const u32 rcon[] = { 
 * Expand the cipher key into the encryption key schedule.

 */

int AES_set_encrypt_key(const unsigned char *userKey, const int bits,

			AES_KEY *key) {

                        AES_KEY *key)

{



    u32 *rk;

    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.

 */

int AES_set_decrypt_key(const unsigned char *userKey, const int bits,

			 AES_KEY *key) {

                        AES_KEY *key)

{



    u32 *rk;

    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

 */

void AES_encrypt(const unsigned char *in, unsigned char *out,

		 const AES_KEY *key) {

                 const AES_KEY *key)

{



    const u32 *rk;

    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;



        /* now do the linear transform using words */

	{	int i;

        {

            int i;

            u32 r0, r1, r2;



            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

 */

void AES_decrypt(const unsigned char *in, unsigned char *out,

		 const AES_KEY *key) {

                 const AES_KEY *key)

{



    const u32 *rk;

    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;



    /* now do the linear transform using words */ 

	{	int i;

    {

        int i;

        u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m;



        for (i = 0; i < 4; i++) {
@@ -977,7 +983,8 @@ void AES_decrypt(const unsigned char *in, unsigned char *out, 
        Td4[(s0 >> 24)       ] << 24;



    /* now do the linear transform using words */ 

	{	int i;

    {

        int i;

        u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m;



        for (i = 0; i < 4; i++) {

util/openssl-format-source

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ do 
      case `basename $j` in 

	# the list of files that indent is unable to handle correctly

	# 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"

	  ;;

	*)