Commit 00ea17f9 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

Conflicts:
	apps/ciphers.c
	crypto/bn/bn.h
	crypto/ec/ec_curve.c
	ssl/t1_enc.c
	ssl/t1_lib.c

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

apps/s_client.c

+2 −1
Original line number Diff line number Diff line
@@ -159,7 +159,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
@@ -141,7 +141,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
@@ -604,23 +604,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
@@ -628,22 +637,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 unsigned int p[]);

/* r = a mod p */

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

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

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

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

	const unsigned int p[], BN_CTX *ctx);

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

int	BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const unsigned 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 unsigned 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 unsigned int p[], BN_CTX *ctx); /* r = (a / b) mod p */

	const unsigned 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 unsigned int p[], BN_CTX *ctx); /* r = (a ^ b) mod p */

	const unsigned int p[], BN_CTX *ctx);

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

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

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

	const unsigned int p[], BN_CTX *ctx);

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

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

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

	const unsigned int p[], BN_CTX *ctx);

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

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

crypto/dh/dh.h

+3 −1
Original line number Diff line number Diff line
@@ -102,9 +102,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);

demos/easy_tls/easy-tls.c

+2 −1
Original line number Diff line number Diff line
@@ -809,8 +809,9 @@ max(int a, int b) 
    return a > b ? a : b;

}



/* timeout, -1 means no timeout */

static void

tls_sockets_select(int read_select_1, int read_select_2, int write_select_1, int write_select_2, int seconds /* timeout, -1 means no timeout */)

tls_sockets_select(int read_select_1, int read_select_2, int write_select_1, int write_select_2, int seconds)

{

    int maxfd, n;

    fd_set reads, writes;