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

Constify ASN1_TYPE_cmp add X509_ALGOR_cmp. 



Reviewed-by: default avatarEmilia Käsper <emilia@openssl.org>
(cherry picked from commit 4c52816d)

Conflicts:
	crypto/asn1/x_algor.c
	crypto/x509/x509.h
parent 0f1c30b0

crypto/asn1/a_type.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ IMPLEMENT_STACK_OF(ASN1_TYPE) 
IMPLEMENT_ASN1_SET_OF(ASN1_TYPE)



/* Returns 0 if they are equal, != 0 otherwise. */

int ASN1_TYPE_cmp(ASN1_TYPE *a, ASN1_TYPE *b)

int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b)

	{

	int result = -1;

crypto/asn1/asn1.h

+1 −1
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ DECLARE_ASN1_FUNCTIONS_fname(ASN1_TYPE, ASN1_ANY, ASN1_TYPE) 
int ASN1_TYPE_get(ASN1_TYPE *a);

void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value);

int ASN1_TYPE_set1(ASN1_TYPE *a, int type, const void *value);

int            ASN1_TYPE_cmp(ASN1_TYPE *a, ASN1_TYPE *b);

int            ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b);



ASN1_OBJECT *	ASN1_OBJECT_new(void );

void		ASN1_OBJECT_free(ASN1_OBJECT *a);

crypto/asn1/x_algor.c

+10 −0
Original line number Diff line number Diff line
@@ -128,3 +128,13 @@ void X509_ALGOR_get0(ASN1_OBJECT **paobj, int *pptype, void **ppval, 
		}

	}



int X509_ALGOR_cmp(const X509_ALGOR *a, const X509_ALGOR *b)

	{

	int rv;

	rv = OBJ_cmp(a->algorithm, b->algorithm);

	if (rv)

		return rv;

	if (!a->parameter && !b->parameter)

		return 0;

	return ASN1_TYPE_cmp(a->parameter, b->parameter);

	}

crypto/x509/x509.h

+1 −0
Original line number Diff line number Diff line
@@ -763,6 +763,7 @@ X509_ALGOR *X509_ALGOR_dup(X509_ALGOR *xn); 
int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval);

void X509_ALGOR_get0(ASN1_OBJECT **paobj, int *pptype, void **ppval,

						X509_ALGOR *algor);

int X509_ALGOR_cmp(const X509_ALGOR *a, const X509_ALGOR *b);



X509_NAME *X509_NAME_dup(X509_NAME *xn);

X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne);