Commit c8bbd98a authored by Ben Laurie's avatar Ben Laurie
Browse files

Fix warnings.

parent 57ae37a0

apps/apps.c

+1 −2
Changes for apps/apps.c: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -377,13 +377,12 @@ void program_name(char *in, char *out, int size) 


int chopup_args(ARGS *arg, char *buf, int *argc, char **argv[])

	{

	int num,len,i;

	int num,i;

	char *p;



	*argc=0;

	*argv=NULL;



	len=strlen(buf);

	i=0;

	if (arg->count == 0)

		{

apps/dh.c

+1 −4
Changes for apps/dh.c: 1 added line, 4 removed lines.
Original line number Diff line number Diff line
@@ -88,9 +88,6 @@ int MAIN(int, char **); 


int MAIN(int argc, char **argv)

	{

#ifndef OPENSSL_NO_ENGINE

	ENGINE *e = NULL;

#endif

	DH *dh=NULL;

	int i,badops=0,text=0;

	BIO *in=NULL,*out=NULL;
@@ -189,7 +186,7 @@ bad: 
	ERR_load_crypto_strings();



#ifndef OPENSSL_NO_ENGINE

        e = setup_engine(bio_err, engine, 0);

        setup_engine(bio_err, engine, 0);

#endif



	in=BIO_new(BIO_s_file());

apps/dhparam.c

+1 −4
Changes for apps/dhparam.c: 1 added line, 4 removed lines.
Original line number Diff line number Diff line
@@ -149,9 +149,6 @@ int MAIN(int, char **); 


int MAIN(int argc, char **argv)

	{

#ifndef OPENSSL_NO_ENGINE

	ENGINE *e = NULL;

#endif

	DH *dh=NULL;

	int i,badops=0,text=0;

#ifndef OPENSSL_NO_DSA
@@ -270,7 +267,7 @@ bad: 
	ERR_load_crypto_strings();



#ifndef OPENSSL_NO_ENGINE

        e = setup_engine(bio_err, engine, 0);

        setup_engine(bio_err, engine, 0);

#endif



	if (g && !num)

apps/dsaparam.c

+2 −7
Changes for apps/dsaparam.c: 2 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -111,9 +111,6 @@ int MAIN(int, char **); 


int MAIN(int argc, char **argv)

	{

#ifndef OPENSSL_NO_ENGINE

	ENGINE *e = NULL;

#endif

	DSA *dsa=NULL;

	int i,badops=0,text=0;

	BIO *in=NULL,*out=NULL;
@@ -278,7 +275,7 @@ bad: 
		}



#ifndef OPENSSL_NO_ENGINE

        e = setup_engine(bio_err, engine, 0);

        setup_engine(bio_err, engine, 0);

#endif



	if (need_rand)
@@ -357,12 +354,10 @@ bad: 
	if (C)

		{

		unsigned char *data;

		int l,len,bits_p,bits_q,bits_g;

		int l,len,bits_p;



		len=BN_num_bytes(dsa->p);

		bits_p=BN_num_bits(dsa->p);

		bits_q=BN_num_bits(dsa->q);

		bits_g=BN_num_bits(dsa->g);

		data=(unsigned char *)OPENSSL_malloc(len+20);

		if (data == NULL)

			{

apps/ec.c

+1 −4
Changes for apps/ec.c: 1 added line, 4 removed lines.
Original line number Diff line number Diff line
@@ -85,9 +85,6 @@ int MAIN(int, char **); 


int MAIN(int argc, char **argv)

{

#ifndef OPENSSL_NO_ENGINE

	ENGINE 	*e = NULL;

#endif

	int 	ret = 1;

	EC_KEY 	*eckey = NULL;

	const EC_GROUP *group;
@@ -254,7 +251,7 @@ bad: 
	ERR_load_crypto_strings();



#ifndef OPENSSL_NO_ENGINE

        e = setup_engine(bio_err, engine, 0);

        setup_engine(bio_err, engine, 0);

#endif



	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout))