Commit 78ef9b02 authored by Ben Laurie's avatar Ben Laurie
Browse files

Fix warnings.

parent ed9b0e5c

apps/srp.c

+1 −4
Original line number Diff line number Diff line
@@ -267,9 +267,6 @@ static char *srp_create_user(char *user, char **srp_verifier, 


int MAIN(int argc, char **argv)

	{

#ifndef OPENSSL_NO_ENGINE

	ENGINE *e = NULL;

#endif

	int add_user = 0;

	int list_user= 0;

	int delete_user= 0;
@@ -424,7 +421,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))

crypto/evp/p_sign.c

+2 −2
Original line number Diff line number Diff line
@@ -80,8 +80,9 @@ int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen, 
	{

	unsigned char m[EVP_MAX_MD_SIZE];

	unsigned int m_len;

	int i,ok=0,v;

	int i=0,ok=0,v;

	EVP_MD_CTX tmp_ctx;

	EVP_PKEY_CTX *pkctx = NULL;



	*siglen=0;

	EVP_MD_CTX_init(&tmp_ctx);
@@ -93,7 +94,6 @@ int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen, 


	if (ctx->digest->flags & EVP_MD_FLAG_PKEY_METHOD_SIGNATURE)

		{

		EVP_PKEY_CTX *pkctx = NULL;

		size_t sltmp = (size_t)EVP_PKEY_size(pkey);

		i = 0;

		pkctx = EVP_PKEY_CTX_new(pkey, NULL);

crypto/evp/p_verify.c

+2 −2
Original line number Diff line number Diff line
@@ -67,8 +67,9 @@ int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf, 
	{

	unsigned char m[EVP_MAX_MD_SIZE];

	unsigned int m_len;

	int i,ok=0,v;

	int i=-1,ok=0,v;

	EVP_MD_CTX tmp_ctx;

	EVP_PKEY_CTX *pkctx = NULL;



	EVP_MD_CTX_init(&tmp_ctx);

	if (!EVP_MD_CTX_copy_ex(&tmp_ctx,ctx))
@@ -79,7 +80,6 @@ int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf, 


	if (ctx->digest->flags & EVP_MD_FLAG_PKEY_METHOD_SIGNATURE)

		{

		EVP_PKEY_CTX *pkctx = NULL;

		i = -1;

		pkctx = EVP_PKEY_CTX_new(pkey, NULL);

		if (!pkctx)

crypto/x509/x509_vfy.c

+0 −5
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ static int x509_subject_cmp(X509 **a, X509 **b) 
int X509_verify_cert(X509_STORE_CTX *ctx)

	{

	X509 *x,*xtmp,*chain_ss=NULL;

	X509_NAME *xn;

	int bad_chain = 0;

	X509_VERIFY_PARAM *param = ctx->param;

	int depth,i,ok=0;
@@ -205,7 +204,6 @@ int X509_verify_cert(X509_STORE_CTX *ctx) 
		                         */



		/* If we are self signed, we break */

		xn=X509_get_issuer_name(x);

		if (ctx->check_issued(ctx, x,x)) break;



		/* If we were passed a cert chain, use it first */
@@ -242,7 +240,6 @@ int X509_verify_cert(X509_STORE_CTX *ctx) 


	i=sk_X509_num(ctx->chain);

	x=sk_X509_value(ctx->chain,i-1);

	xn = X509_get_subject_name(x);

	if (ctx->check_issued(ctx, x, x))

		{

		/* we have a self signed certificate */
@@ -291,7 +288,6 @@ int X509_verify_cert(X509_STORE_CTX *ctx) 
		if (depth < num) break;



		/* If we are self signed, we break */

		xn=X509_get_issuer_name(x);

		if (ctx->check_issued(ctx,x,x)) break;



		ok = ctx->get_issuer(&xtmp, ctx, x);
@@ -310,7 +306,6 @@ int X509_verify_cert(X509_STORE_CTX *ctx) 
		}



	/* we now have our chain, lets check it... */

	xn=X509_get_issuer_name(x);



	/* Is last certificate looked up self signed? */

	if (!ctx->check_issued(ctx,x,x))