Commit 65f1d188 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix source where indent will not be able to cope 



Conflicts:
	apps/ciphers.c
	ssl/s3_pkt.c

Conflicts:
	crypto/ec/ec_curve.c

Conflicts:
	crypto/ec/ec_curve.c
	ssl/s3_clnt.c
	ssl/s3_srvr.c
	ssl/ssl_sess.c

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

apps/ciphers.c

+12 −3
Original line number Diff line number Diff line
@@ -197,11 +197,20 @@ int MAIN(int argc, char **argv) 
				int id3 = (int)(id & 0xffL);

				

				if ((id & 0xff000000L) == 0x02000000L)

					BIO_printf(STDout, "     0x%02X,0x%02X,0x%02X - ", id1, id2, id3); /* SSL2 cipher */

					{

					/* SSL2 cipher */

					BIO_printf(STDout, "     0x%02X,0x%02X,0x%02X - ", id1, id2, id3);

					}

				else if ((id & 0xff000000L) == 0x03000000L)

					BIO_printf(STDout, "          0x%02X,0x%02X - ", id2, id3); /* SSL3 cipher */

					{

					/* SSL3 cipher */

					BIO_printf(STDout, "          0x%02X,0x%02X - ", id2, id3);

					}

				else

					BIO_printf(STDout, "0x%02X,0x%02X,0x%02X,0x%02X - ", id0, id1, id2, id3); /* whatever */

					{

					/* whatever */

					BIO_printf(STDout, "0x%02X,0x%02X,0x%02X,0x%02X - ", id0, id1, id2, id3);

					}

				}



			BIO_puts(STDout,SSL_CIPHER_description(c,buf,sizeof buf));

apps/s_client.c

+2 −1
Original line number Diff line number Diff line
@@ -182,7 +182,8 @@ typedef unsigned int u_int; 
/*#define SSL_HOST_NAME	"193.118.187.102" */

#define SSL_HOST_NAME	"localhost"



/*#define TEST_CERT "client.pem" */ /* no default cert. */

/* no default cert. */

/*#define TEST_CERT "client.pem" */



#undef BUFSIZZ

#define BUFSIZZ 1024*8

apps/s_time.c

+2 −1
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ 


#define SSL_CONNECT_NAME	"localhost:4433"



/*#define TEST_CERT "client.pem" */ /* no default cert. */

/* no default cert. */

/*#define TEST_CERT "client.pem" */



#undef BUFSIZZ

#define BUFSIZZ 1024*10

crypto/bn/bn.h

+33 −17
Original line number Diff line number Diff line
@@ -623,23 +623,32 @@ int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, 
 * be expanded to the appropriate size if needed.

 */



int	BN_GF2m_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b); /*r = a + b*/

/*r = a + b*/

int	BN_GF2m_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);

#define BN_GF2m_sub(r, a, b) BN_GF2m_add(r, a, b)

int	BN_GF2m_mod(BIGNUM *r, const BIGNUM *a, const BIGNUM *p); /*r=a mod p*/

/*r=a mod p*/

int	BN_GF2m_mod(BIGNUM *r, const BIGNUM *a, const BIGNUM *p);

/* r = (a * b) mod p */

int	BN_GF2m_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,

	const BIGNUM *p, BN_CTX *ctx); /* r = (a * b) mod p */

	const BIGNUM *p, BN_CTX *ctx);

/* r = (a * a) mod p */

int	BN_GF2m_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,

	BN_CTX *ctx); /* r = (a * a) mod p */

	BN_CTX *ctx);

/* r = (1 / b) mod p */

int	BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *b, const BIGNUM *p,

	BN_CTX *ctx); /* r = (1 / b) mod p */

	BN_CTX *ctx);

/* r = (a / b) mod p */

int	BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,

	const BIGNUM *p, BN_CTX *ctx); /* r = (a / b) mod p */

	const BIGNUM *p, BN_CTX *ctx);

/* r = (a ^ b) mod p */

int	BN_GF2m_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,

	const BIGNUM *p, BN_CTX *ctx); /* r = (a ^ b) mod p */

	const BIGNUM *p, BN_CTX *ctx); 

/* r = sqrt(a) mod p */

int	BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,

	BN_CTX *ctx); /* r = sqrt(a) mod p */

	BN_CTX *ctx);

/* r^2 + r = a mod p */

int	BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,

	BN_CTX *ctx); /* r^2 + r = a mod p */

	BN_CTX *ctx);

#define BN_GF2m_cmp(a, b) BN_ucmp((a), (b))

/*-

 * Some functions allow for representation of the irreducible polynomials
@@ -647,22 +656,29 @@ int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, 
 *     t^p[0] + t^p[1] + ... + t^p[k]

 * where m = p[0] > p[1] > ... > p[k] = 0.

 */

int	BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const int p[]);

/* r = a mod p */

int	BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const int p[]);

/* r = (a * b) mod p */

int	BN_GF2m_mod_mul_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,

	const int p[], BN_CTX *ctx); /* r = (a * b) mod p */

	const int p[], BN_CTX *ctx);

/* r = (a * a) mod p */

int	BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const int p[],

	BN_CTX *ctx); /* r = (a * a) mod p */

	BN_CTX *ctx);

/* r = (1 / b) mod p */

int	BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *b, const int p[],

	BN_CTX *ctx); /* r = (1 / b) mod p */

	BN_CTX *ctx);

/* r = (a / b) mod p */

int	BN_GF2m_mod_div_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,

	const int p[], BN_CTX *ctx); /* r = (a / b) mod p */

	const int p[], BN_CTX *ctx);

/* r = (a ^ b) mod p */

int	BN_GF2m_mod_exp_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,

	const int p[], BN_CTX *ctx); /* r = (a ^ b) mod p */

	const int p[], BN_CTX *ctx);

/* r = sqrt(a) mod p */

int	BN_GF2m_mod_sqrt_arr(BIGNUM *r, const BIGNUM *a,

	const int p[], BN_CTX *ctx); /* r = sqrt(a) mod p */

	const int p[], BN_CTX *ctx);

/* r^2 + r = a mod p */

int	BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a,

	const int p[], BN_CTX *ctx); /* r^2 + r = a mod p */

	const int p[], BN_CTX *ctx);

int	BN_GF2m_poly2arr(const BIGNUM *a, int p[], int max);

int	BN_GF2m_arr2poly(const int p[], BIGNUM *a);

crypto/dh/dh.h

+3 −1
Original line number Diff line number Diff line
@@ -100,9 +100,11 @@ struct dh_method 
	/* Methods here */

	int (*generate_key)(DH *dh);

	int (*compute_key)(unsigned char *key,const BIGNUM *pub_key,DH *dh);



	/* Can be null */

	int (*bn_mod_exp)(const DH *dh, BIGNUM *r, const BIGNUM *a,

				const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,

				BN_MONT_CTX *m_ctx); /* Can be null */

				BN_MONT_CTX *m_ctx);



	int (*init)(DH *dh);

	int (*finish)(DH *dh);