Commit 3ad5ae5d authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix strange formatting by indent 



Conflicts:
	crypto/hmac/hmac.h

Conflicts:
	crypto/evp/e_aes_cbc_hmac_sha256.c

Conflicts:
	crypto/ec/ecp_nistp224.c
	crypto/ec/ecp_nistp256.c
	crypto/ec/ecp_nistp521.c
	crypto/ec/ectest.c

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

crypto/asn1/asn1_par.c

+16 −8
Original line number Diff line number Diff line
@@ -418,14 +418,22 @@ end: 
const char *ASN1_tag2str(int tag)

{

	static const char * const tag2str[] = {

	 "EOC", "BOOLEAN", "INTEGER", "BIT STRING", "OCTET STRING", /* 0-4 */

	 "NULL", "OBJECT", "OBJECT DESCRIPTOR", "EXTERNAL", "REAL", /* 5-9 */

	 "ENUMERATED", "<ASN1 11>", "UTF8STRING", "<ASN1 13>", 	    /* 10-13 */

	"<ASN1 14>", "<ASN1 15>", "SEQUENCE", "SET", 		    /* 15-17 */

	"NUMERICSTRING", "PRINTABLESTRING", "T61STRING",	    /* 18-20 */

	"VIDEOTEXSTRING", "IA5STRING", "UTCTIME","GENERALIZEDTIME", /* 21-24 */

	"GRAPHICSTRING", "VISIBLESTRING", "GENERALSTRING",	    /* 25-27 */

	"UNIVERSALSTRING", "<ASN1 29>", "BMPSTRING"		    /* 28-30 */

        /* 0-4 */

	 "EOC", "BOOLEAN", "INTEGER", "BIT STRING", "OCTET STRING",

        /* 5-9 */ 

	 "NULL", "OBJECT", "OBJECT DESCRIPTOR", "EXTERNAL", "REAL",

        /* 10-13 */

	 "ENUMERATED", "<ASN1 11>", "UTF8STRING", "<ASN1 13>",

        /* 15-17 */ 

	"<ASN1 14>", "<ASN1 15>", "SEQUENCE", "SET",

        /* 18-20 */  

	"NUMERICSTRING", "PRINTABLESTRING", "T61STRING",

        /* 21-24 */

	"VIDEOTEXSTRING", "IA5STRING", "UTCTIME","GENERALIZEDTIME",

        /* 25-27 */

	"GRAPHICSTRING", "VISIBLESTRING", "GENERALSTRING",

        /* 28-30 */

	"UNIVERSALSTRING", "<ASN1 29>", "BMPSTRING"

	};



	if((tag == V_ASN1_NEG_INTEGER) || (tag == V_ASN1_NEG_ENUMERATED))

crypto/asn1/d2i_pu.c

+4 −2
Original line number Diff line number Diff line
@@ -97,8 +97,9 @@ EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp, 
		{

#ifndef OPENSSL_NO_RSA

	case EVP_PKEY_RSA:

		/* TMP UGLY CAST */

		if ((ret->pkey.rsa=d2i_RSAPublicKey(NULL,

			(const unsigned char **)pp,length)) == NULL) /* TMP UGLY CAST */

			(const unsigned char **)pp,length)) == NULL)

			{

			ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_ASN1_LIB);

			goto err;
@@ -107,8 +108,9 @@ EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp, 
#endif

#ifndef OPENSSL_NO_DSA

	case EVP_PKEY_DSA:

		/* TMP UGLY CAST */

		if (!d2i_DSAPublicKey(&(ret->pkey.dsa),

			(const unsigned char **)pp,length)) /* TMP UGLY CAST */

			(const unsigned char **)pp,length))

			{

			ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_ASN1_LIB);

			goto err;

crypto/asn1/t_x509.c

+2 −1
Original line number Diff line number Diff line
@@ -364,7 +364,8 @@ int ASN1_GENERALIZEDTIME_print(BIO *bp, const ASN1_GENERALIZEDTIME *tm) 
	if (v[i-1] == 'Z') gmt=1;

	for (i=0; i<12; i++)

		if ((v[i] > '9') || (v[i] < '0')) goto err;

	y= (v[0]-'0')*1000+(v[1]-'0')*100 + (v[2]-'0')*10+(v[3]-'0');

	y= (v[0]-'0')*1000+(v[1]-'0')*100

		+ (v[2]-'0')*10+(v[3]-'0');

	M= (v[4]-'0')*10+(v[5]-'0');

	if ((M > 12) || (M < 1)) goto err;

	d= (v[6]-'0')*10+(v[7]-'0');

crypto/asn1/tasn_dec.c

+18 −9
Original line number Diff line number Diff line
@@ -94,15 +94,24 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval, 


/* Table to convert tags to bit values, used for MSTRING type */

static const unsigned long tag2bit[32] = {

0,	0,	0,	B_ASN1_BIT_STRING,	/* tags  0 -  3 */

B_ASN1_OCTET_STRING,	0,	0,		B_ASN1_UNKNOWN,/* tags  4- 7 */

B_ASN1_UNKNOWN,	B_ASN1_UNKNOWN,	B_ASN1_UNKNOWN,	B_ASN1_UNKNOWN,/* tags  8-11 */

B_ASN1_UTF8STRING,B_ASN1_UNKNOWN,B_ASN1_UNKNOWN,B_ASN1_UNKNOWN,/* tags 12-15 */

B_ASN1_SEQUENCE,0,B_ASN1_NUMERICSTRING,B_ASN1_PRINTABLESTRING, /* tags 16-19 */

B_ASN1_T61STRING,B_ASN1_VIDEOTEXSTRING,B_ASN1_IA5STRING,       /* tags 20-22 */

B_ASN1_UTCTIME, B_ASN1_GENERALIZEDTIME,			       /* tags 23-24 */	

B_ASN1_GRAPHICSTRING,B_ASN1_ISO64STRING,B_ASN1_GENERALSTRING,  /* tags 25-27 */

B_ASN1_UNIVERSALSTRING,B_ASN1_UNKNOWN,B_ASN1_BMPSTRING,B_ASN1_UNKNOWN, /* tags 28-31 */

    /* tags  0 -  3 */

0,	0,	0,	B_ASN1_BIT_STRING,	

    /* tags  4- 7 */

B_ASN1_OCTET_STRING,	0,	0,		B_ASN1_UNKNOWN,

    /* tags  8-11 */

B_ASN1_UNKNOWN,	B_ASN1_UNKNOWN,	B_ASN1_UNKNOWN,	B_ASN1_UNKNOWN,

    /* tags 12-15 */

B_ASN1_UTF8STRING,B_ASN1_UNKNOWN,B_ASN1_UNKNOWN,B_ASN1_UNKNOWN,

    /* tags 16-19 */

B_ASN1_SEQUENCE,0,B_ASN1_NUMERICSTRING,B_ASN1_PRINTABLESTRING,

    /* tags 20-22 */

B_ASN1_T61STRING,B_ASN1_VIDEOTEXSTRING,B_ASN1_IA5STRING,

    /* tags 23-24 */

B_ASN1_UTCTIME, B_ASN1_GENERALIZEDTIME,

    /* tags 25-27 */

B_ASN1_GRAPHICSTRING,B_ASN1_ISO64STRING,B_ASN1_GENERALSTRING,  

    /* tags 28-31 */

B_ASN1_UNIVERSALSTRING,B_ASN1_UNKNOWN,B_ASN1_BMPSTRING,B_ASN1_UNKNOWN,

	};



unsigned long ASN1_tag2bit(int tag)

crypto/des/set_key.c

+16 −8
Original line number Diff line number Diff line
@@ -182,7 +182,8 @@ static const DES_LONG des_skb[8][64]={ 
	0x00090020L,0x00090030L,0x20090020L,0x20090030L,

	0x00080820L,0x00080830L,0x20080820L,0x20080830L,

	0x00090820L,0x00090830L,0x20090820L,0x20090830L,

	},{

	},

	{

	/* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */

	0x00000000L,0x02000000L,0x00002000L,0x02002000L,

	0x00200000L,0x02200000L,0x00202000L,0x02202000L,
@@ -200,7 +201,8 @@ static const DES_LONG des_skb[8][64]={ 
	0x10200400L,0x12200400L,0x10202400L,0x12202400L,

	0x10000404L,0x12000404L,0x10002404L,0x12002404L,

	0x10200404L,0x12200404L,0x10202404L,0x12202404L,

	},{

	},

	{

	/* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */

	0x00000000L,0x00000001L,0x00040000L,0x00040001L,

	0x01000000L,0x01000001L,0x01040000L,0x01040001L,
@@ -218,7 +220,8 @@ static const DES_LONG des_skb[8][64]={ 
	0x09000200L,0x09000201L,0x09040200L,0x09040201L,

	0x08000202L,0x08000203L,0x08040202L,0x08040203L,

	0x09000202L,0x09000203L,0x09040202L,0x09040203L,

	},{

	},

	{

	/* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */

	0x00000000L,0x00100000L,0x00000100L,0x00100100L,

	0x00000008L,0x00100008L,0x00000108L,0x00100108L,
@@ -236,7 +239,8 @@ static const DES_LONG des_skb[8][64]={ 
	0x04020008L,0x04120008L,0x04020108L,0x04120108L,

	0x04021000L,0x04121000L,0x04021100L,0x04121100L,

	0x04021008L,0x04121008L,0x04021108L,0x04121108L,

	},{

	},

	{

	/* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */

	0x00000000L,0x10000000L,0x00010000L,0x10010000L,

	0x00000004L,0x10000004L,0x00010004L,0x10010004L,
@@ -254,7 +258,8 @@ static const DES_LONG des_skb[8][64]={ 
	0x00101004L,0x10101004L,0x00111004L,0x10111004L,

	0x20101000L,0x30101000L,0x20111000L,0x30111000L,

	0x20101004L,0x30101004L,0x20111004L,0x30111004L,

	},{

	},

	{

	/* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */

	0x00000000L,0x08000000L,0x00000008L,0x08000008L,

	0x00000400L,0x08000400L,0x00000408L,0x08000408L,
@@ -272,7 +277,8 @@ static const DES_LONG des_skb[8][64]={ 
	0x02000401L,0x0A000401L,0x02000409L,0x0A000409L,

	0x02020001L,0x0A020001L,0x02020009L,0x0A020009L,

	0x02020401L,0x0A020401L,0x02020409L,0x0A020409L,

	},{

	},

	{

	/* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */

	0x00000000L,0x00000100L,0x00080000L,0x00080100L,

	0x01000000L,0x01000100L,0x01080000L,0x01080100L,
@@ -290,7 +296,8 @@ static const DES_LONG des_skb[8][64]={ 
	0x01200200L,0x01200300L,0x01280200L,0x01280300L,

	0x00200210L,0x00200310L,0x00280210L,0x00280310L,

	0x01200210L,0x01200310L,0x01280210L,0x01280310L,

	},{

	},

	{

	/* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */

	0x00000000L,0x04000000L,0x00040000L,0x04040000L,

	0x00000002L,0x04000002L,0x00040002L,0x04040002L,
@@ -308,7 +315,8 @@ static const DES_LONG des_skb[8][64]={ 
	0x00000822L,0x04000822L,0x00040822L,0x04040822L,

	0x00002820L,0x04002820L,0x00042820L,0x04042820L,

	0x00002822L,0x04002822L,0x00042822L,0x04042822L,

	}};

	}

};



int DES_set_key(const_DES_cblock *key, DES_key_schedule *schedule)

	{