Commit 61f5b6f3 authored by Ben Laurie's avatar Ben Laurie
Browse files

Work with -pedantic!

parent 779cc0bc

Configure

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ my %table=( 
# Our development configs

"purify",	"purify gcc:-g -DPURIFY -Wall:-lsocket -lnsl::::",

"debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:-lefence::::",

"debug-ben",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -O2 -Wall -Wshadow -Werror -pipe:::::",

"debug-ben",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -O2 -pedantic -Wall -Wshadow -Werror -pipe:::::",

"debug-ben-strict",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe:::::",

"debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",

"dist",		"cc:-O:::::",

apps/pkcs12.c

+7 −7
Original line number Diff line number Diff line
@@ -78,9 +78,9 @@ EVP_CIPHER *enc; 


#ifndef NOPROTO

int get_cert_chain(X509 *cert, STACK **chain);

int dump_certs_keys_p12(BIO *out, PKCS12 *p12, unsigned char *pass, int passlen, int options);

int dump_certs_pkeys_bags(BIO *out, STACK *bags, unsigned char *pass, int passlen, int options);

int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bags, unsigned char *pass, int passlen, int options);

int dump_certs_keys_p12(BIO *out, PKCS12 *p12, char *pass, int passlen, int options);

int dump_certs_pkeys_bags(BIO *out, STACK *bags, char *pass, int passlen, int options);

int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bags, char *pass, int passlen, int options);

int print_attribs(BIO *out, STACK *attrlst, char *name);

void hex_prin(BIO *out, unsigned char *buf, int len);

int alg_print(BIO *x, X509_ALGOR *alg);
@@ -274,7 +274,7 @@ if (export_cert) { 
	char *catmp;

	int i, pmatch = 0;

	unsigned char keyid[EVP_MAX_MD_SIZE];

	int keyidlen;

	unsigned int keyidlen;

	/* Get private key so we can match it to a certificate */

	key = PEM_read_bio_PrivateKey(inkey ? inkey : in, NULL, NULL);

	if (!inkey) BIO_reset(in);
@@ -452,7 +452,7 @@ int dump_cert_text (BIO *out, X509 *x) 
        return 0;

}



int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, unsigned char *pass,

int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass,

	     int passlen, int options)

{

	STACK *asafes, *bags;
@@ -485,7 +485,7 @@ int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, unsigned char *pass, 
	return 1;

}



int dump_certs_pkeys_bags (BIO *out, STACK *bags, unsigned char *pass,

int dump_certs_pkeys_bags (BIO *out, STACK *bags, char *pass,

	     int passlen, int options)

{

	int i;
@@ -497,7 +497,7 @@ int dump_certs_pkeys_bags (BIO *out, STACK *bags, unsigned char *pass, 
	return 1;

}



int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, unsigned char *pass,

int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,

	     int passlen, int options)

{

	EVP_PKEY *pkey;

apps/s_server.c

+8 −6
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ 


#ifndef NOPROTO

static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int export,int keylength);

static int sv_body(char *hostname, int s, char *context);

static int www_body(char *hostname, int s, char *context);

static int sv_body(char *hostname, int s, unsigned char *context);

static int www_body(char *hostname, int s, unsigned char *context);

static void close_accept_socket(void );

static void sv_usage(void);

static int init_ssl_connection(SSL *s);
@@ -556,7 +556,7 @@ static void print_stats(BIO *bio, SSL_CTX *ssl_ctx) 
		SSL_CTX_sess_get_cache_size(ssl_ctx));

	}



static int sv_body(char *hostname, int s, char *context)

static int sv_body(char *hostname, int s, unsigned char *context)

	{

	char *buf=NULL;

	fd_set readfds;
@@ -586,7 +586,8 @@ static int sv_body(char *hostname, int s, char *context) 
	if (con == NULL) {

		con=(SSL *)SSL_new(ctx);

		if(context)

		      SSL_set_session_id_context(con, context, strlen(context));

		      SSL_set_session_id_context(con, context,

						 strlen((char *)context));

	}

	SSL_clear(con);
@@ -871,7 +872,7 @@ static int load_CA(SSL_CTX *ctx, char *file) 
	}

#endif



static int www_body(char *hostname, int s, char *context)

static int www_body(char *hostname, int s, unsigned char *context)

	{

	char *buf=NULL;

	int ret=1;
@@ -904,7 +905,8 @@ static int www_body(char *hostname, int s, char *context) 
	if (!BIO_set_write_buffer_size(io,bufsize)) goto err;



	if ((con=(SSL *)SSL_new(ctx)) == NULL) goto err;

	if(context) SSL_set_session_id_context(con, context, strlen(context));

	if(context) SSL_set_session_id_context(con, context,

					       strlen((char *)context));



	sbio=BIO_new_socket(s,BIO_NOCLOSE);

	if (s_nbio_test)

apps/s_socket.c

+2 −2
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ int init_client_ip(int *sock, unsigned char ip[4], int port) 
int nbio_sock_error(int sock)

	{

	int j,i;

	unsigned int size;

	int size;



	size=sizeof(int);

	i=getsockopt(sock,SOL_SOCKET,SO_ERROR,(char *)&j,&size);
@@ -360,7 +360,7 @@ int do_accept(int acc_sock, int *sock, char **host) 
	int ret,i;

	struct hostent *h1,*h2;

	static struct sockaddr_in from;

	unsigned int len;

	int len;

/*	struct linger ling; */



	if (!sock_init()) return(0);

crypto/Makefile.ssl

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ LIBOBJ= cryptlib.o mem.o cversion.o ex_data.o tmdiff.o $(ERRC).o 


SRC= $(LIBSRC)



EXHEADER= crypto.h cryptall.h tmdiff.h opensslv.h

HEADER=	cryptlib.h date.h opensslconf.h $(EXHEADER)

EXHEADER= crypto.h cryptall.h tmdiff.h opensslv.h opensslconf.h

HEADER=	cryptlib.h date.h $(EXHEADER)



ALL=    $(GENERAL) $(SRC) $(HEADER)