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

Manually reformat aes_core.c 


Add aes_core.c to the list of files not processed by openssl-format-source

Conflicts:
	crypto/aes/aes_core.c

Conflicts:
	crypto/aes/aes_core.c

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent 7566807c

crypto/aes/aes_core.c

+404 −400
Original line number Diff line number Diff line
@@ -626,7 +626,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;
@@ -727,7 +728,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;
@@ -970,7 +972,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, t0, t1, t2, t3;
@@ -1202,7 +1205,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;

    u32 temp;
@@ -1302,8 +1306,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;

    u32 temp;

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)

	obj_dat.h|aes_core.c)

	  echo "skipping $j"

	  ;;

	*)