Commit a229e303 authored by Richard Levitte's avatar Richard Levitte
Browse files

Get rid if the annoying warning

parent 4aca9297

crypto/asn1/a_type.c

+4 −1
Original line number Diff line number Diff line
@@ -71,7 +71,10 @@ int ASN1_TYPE_get(ASN1_TYPE *a) 
void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value)

	{

	if (a->value.ptr != NULL)

		ASN1_primitive_free((ASN1_VALUE **)&a, NULL);

		{

		ASN1_TYPE **tmp_a = &a;

		ASN1_primitive_free((ASN1_VALUE **)tmp_a, NULL);

		}

	a->type=type;

	a->value.ptr=value;

	}

crypto/asn1/x_name.c

+11 −8
Original line number Diff line number Diff line
@@ -160,21 +160,22 @@ static int x509_name_ex_d2i(ASN1_VALUE **val, const unsigned char **in, long len 
					int tag, int aclass, char opt, ASN1_TLC *ctx)

{

	const unsigned char *p = *in, *q;

	STACK *intname = NULL;

	STACK *intname = NULL, **intname_pp = &intname;

	int i, j, ret;

	X509_NAME *nm = NULL;

	X509_NAME *nm = NULL, **nm_pp = &nm;

	STACK_OF(X509_NAME_ENTRY) *entries;

	X509_NAME_ENTRY *entry;

	q = p;



	/* Get internal representation of Name */

	ret = ASN1_item_ex_d2i((ASN1_VALUE **)&intname, &p, len, ASN1_ITEM_rptr(X509_NAME_INTERNAL),

	ret = ASN1_item_ex_d2i((ASN1_VALUE **)intname_pp,

			       &p, len, ASN1_ITEM_rptr(X509_NAME_INTERNAL),

			       tag, aclass, opt, ctx);

	

	if(ret <= 0) return ret;



	if(*val) x509_name_ex_free(val, NULL);

	if(!x509_name_ex_new((ASN1_VALUE **)&nm, NULL)) goto err;

	if(!x509_name_ex_new((ASN1_VALUE **)nm_pp, NULL)) goto err;

	/* We've decoded it: now cache encoding */

	if(!BUF_MEM_grow(nm->bytes, p - q)) goto err;

	memcpy(nm->bytes->data, q, p - q);
@@ -218,7 +219,7 @@ static int x509_name_ex_i2d(ASN1_VALUE **val, unsigned char **out, const ASN1_IT 


static int x509_name_encode(X509_NAME *a)

{

	STACK *intname = NULL;

	STACK *intname = NULL, **intname_pp = &intname;

	int len;

	unsigned char *p;

	STACK_OF(X509_NAME_ENTRY) *entries = NULL;
@@ -236,10 +237,12 @@ static int x509_name_encode(X509_NAME *a) 
		}

		if(!sk_X509_NAME_ENTRY_push(entries, entry)) goto memerr;

	}

	len = ASN1_item_ex_i2d((ASN1_VALUE **)&intname, NULL, ASN1_ITEM_rptr(X509_NAME_INTERNAL), -1, -1);

	len = ASN1_item_ex_i2d((ASN1_VALUE **)intname_pp, NULL,

			       ASN1_ITEM_rptr(X509_NAME_INTERNAL), -1, -1);

	if (!BUF_MEM_grow(a->bytes,len)) goto memerr;

	p=(unsigned char *)a->bytes->data;

	ASN1_item_ex_i2d((ASN1_VALUE **)&intname, &p, ASN1_ITEM_rptr(X509_NAME_INTERNAL), -1, -1);

	ASN1_item_ex_i2d((ASN1_VALUE **)intname_pp,

			 &p, ASN1_ITEM_rptr(X509_NAME_INTERNAL), -1, -1);

	sk_pop_free(intname, sk_internal_free);

	a->modified = 0;

	return len;

crypto/pem/pem_lib.c

+3 −1
Original line number Diff line number Diff line
@@ -434,6 +434,7 @@ int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher) 
	int o;

	const EVP_CIPHER *enc=NULL;

	char *p,c;

	char **header_pp = &header;



	cipher->cipher=NULL;

	if ((header == NULL) || (*header == '\0') || (*header == '\n'))
@@ -480,7 +481,8 @@ int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher) 
		PEMerr(PEM_F_PEM_GET_EVP_CIPHER_INFO,PEM_R_UNSUPPORTED_ENCRYPTION);

		return(0);

		}

	if (!load_iv((unsigned char **)&header,&(cipher->iv[0]),enc->iv_len)) return(0);

	if (!load_iv((unsigned char **)header_pp,&(cipher->iv[0]),enc->iv_len))

		return(0);



	return(1);

	}