Commit b79c82ea authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix loads of warnings in policy code. 

I'll remember to try to compile this with warnings enabled next time :-)
parent 69d1d5e6

crypto/x509/x509_vfy.h

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ X509_POLICY_NODE *X509_policy_level_get0_node(X509_POLICY_LEVEL *level, int i); 


const ASN1_OBJECT *X509_policy_node_get0_policy(const X509_POLICY_NODE *node);



STACK_OF(POLICYQUALIFIER) *

STACK_OF(POLICYQUALINFO) *

	X509_policy_node_get0_qualifiers(const X509_POLICY_NODE *node);

const X509_POLICY_NODE *

	X509_policy_node_get0_parent(const X509_POLICY_NODE *node);

crypto/x509v3/pcy_cache.c

+4 −3
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ 


#include "pcy_int.h"



static int policy_data_cmp(void *pa, void *pb);

static int policy_data_cmp(const X509_POLICY_DATA * const *a,

				const X509_POLICY_DATA * const *b);

static int policy_cache_set_int(long *out, ASN1_INTEGER *value);



/* Set cache entry according to CertificatePolicies extension.
@@ -269,9 +270,9 @@ X509_POLICY_DATA *policy_cache_find_data(const X509_POLICY_CACHE *cache, 
	return sk_X509_POLICY_DATA_value(cache->data, idx);

	}



static int policy_data_cmp(void *pa, void *pb)

static int policy_data_cmp(const X509_POLICY_DATA * const *a,

				const X509_POLICY_DATA * const *b)

	{

	X509_POLICY_DATA **a = pa; X509_POLICY_DATA **b = pb;

	return OBJ_cmp((*a)->valid_policy, (*b)->valid_policy);

	}

crypto/x509v3/pcy_data.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ void policy_data_free(X509_POLICY_DATA *data) 
	ASN1_OBJECT_free(data->valid_policy);

	/* Don't free qualifiers if shared */

	if (!(data->flags & POLICY_DATA_FLAG_SHARED_QUALIFIERS))

		sk_POLICYINFO_pop_free(data->qualifier_set,

		sk_POLICYQUALINFO_pop_free(data->qualifier_set,

					POLICYQUALINFO_free);

	sk_ASN1_OBJECT_pop_free(data->expected_policy_set, ASN1_OBJECT_free);

	OPENSSL_free(data);

crypto/x509v3/pcy_int.h

+4 −4
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ struct X509_POLICY_DATA_st 
	unsigned int flags;

	/* Policy OID and qualifiers for this data */

	ASN1_OBJECT *valid_policy;

	STACK_OF(POLICYQUALIFIER) *qualifier_set;

	STACK_OF(POLICYQUALINFO) *qualifier_set;

	STACK_OF(ASN1_OBJECT) *expected_policy_set;

	};
@@ -128,7 +128,7 @@ struct X509_POLICY_CACHE_st { 
	/* other policy data */

	STACK_OF(X509_POLICY_DATA) *data;

	/* If policyMappings extension present a table of mapped policies */

	STACK_OF(POLICY_REF) *maps;

	STACK_OF(X509_POLICY_REF) *maps;

	/* If InhibitAnyPolicy present this is its value or -1 if absent. */

	long any_skip;

	/* If policyConstraints and requireExplicitPolicy present this is its
@@ -210,11 +210,11 @@ void policy_cache_free(X509_POLICY_CACHE *cache); 
X509_POLICY_NODE *level_find_node(const X509_POLICY_LEVEL *level,

					const ASN1_OBJECT *id);



X509_POLICY_NODE *tree_find_sk(STACK_OF(X509_POLICY_TREE) *sk,

X509_POLICY_NODE *tree_find_sk(STACK_OF(X509_POLICY_NODE) *sk,

						const ASN1_OBJECT *id);



X509_POLICY_NODE *level_add_node(X509_POLICY_LEVEL *level,

			const X509_POLICY_DATA *data,

			X509_POLICY_DATA *data,

			X509_POLICY_NODE *parent,

			X509_POLICY_TREE *tree);

void policy_node_free(X509_POLICY_NODE *node);

crypto/x509v3/pcy_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ int X509_policy_node_get_critical(const X509_POLICY_NODE *node) 
	}

#endif



STACK_OF(POLICYQUALIFIER) *

STACK_OF(POLICYQUALINFO) *

		X509_policy_node_get0_qualifiers(const X509_POLICY_NODE *node)

	{

	if (!node)