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

Utility attribute function to retrieve attribute data from an expected 

type. Useful for many attributes which are single valued and can only
have one type.
parent 1ad90a91

crypto/x509/x509.h

+2 −0
Original line number Diff line number Diff line
@@ -1080,6 +1080,8 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x, 
STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x,

			const char *attrname, int type,

			const unsigned char *bytes, int len);

void *X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x,

				ASN1_OBJECT *obj, int lastpos, int type);

X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid,

	     int atrtype, const void *data, int len);

X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr,

crypto/x509/x509_att.c

+16 −0
Original line number Diff line number Diff line
@@ -193,6 +193,22 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x, 
	return ret;

}



void *X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x,

				ASN1_OBJECT *obj, int lastpos, int type)

{

	int i;

	X509_ATTRIBUTE *at;

	i = X509at_get_attr_by_OBJ(x, obj, lastpos);

	if (i == -1)

		return NULL;

	if ((lastpos <= -2) && (X509at_get_attr_by_OBJ(x, obj, i) != -1))

		return NULL;

	at = X509at_get_attr(x, i);

	if (lastpos <= -3 && (X509_ATTRIBUTE_count(at) != 1))

		return NULL;

	return X509_ATTRIBUTE_get0_data(at, type, 0, NULL);

}



X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid,

	     int atrtype, const void *data, int len)

{