X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fasn1%2Fx_attrib.c;h=14e5ea27aa76625c852fe32d58708e06cc2d692b;hb=eaa28181898b8ca0b54552a3290789bb17444c8a;hp=6b33f58f57d1961d8d5bc4a4ba186b963e120188;hpb=ec577822f95a8bca0023c5c77cef1a4916822d4a;p=oweals%2Fopenssl.git

diff --git a/crypto/asn1/x_attrib.c b/crypto/asn1/x_attrib.c
index 6b33f58f57..14e5ea27aa 100644
--- a/crypto/asn1/x_attrib.c
+++ b/crypto/asn1/x_attrib.c
@@ -60,12 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/asn1_mac.h>
-
-/*
- * ASN1err(ASN1_F_D2I_X509_ATTRIBUTE,ERR_R_ASN1_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_X509_ATTRIBUTE_NEW,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
- * ASN1err(ASN1_F_I2D_X509_ATTRIBUTE,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
- */
+#include <openssl/x509.h>
 
 /* sequence */
 int i2d_X509_ATTRIBUTE(X509_ATTRIBUTE *a, unsigned char **pp)
@@ -90,7 +85,7 @@ int i2d_X509_ATTRIBUTE(X509_ATTRIBUTE *a, unsigned char **pp)
 
 		ret+=i2d_ASN1_OBJECT(a->object,p);
 		if (a->set)
-			ret+=i2d_ASN1_SET(a->value.set,p,i2d_ASN1_TYPE,
+			ret+=i2d_ASN1_SET_OF_ASN1_TYPE(a->value.set,p,i2d_ASN1_TYPE,
 				V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET);
 		else
 			ret+=i2d_ASN1_TYPE(a->value.single,p);
@@ -111,7 +106,8 @@ X509_ATTRIBUTE *d2i_X509_ATTRIBUTE(X509_ATTRIBUTE **a, unsigned char **pp,
 		(M_ASN1_next == (V_ASN1_CONSTRUCTED|V_ASN1_UNIVERSAL|V_ASN1_SET)))
 		{
 		ret->set=1;
-		M_ASN1_D2I_get_set(ret->value.set,d2i_ASN1_TYPE,ASN1_TYPE_free);
+		M_ASN1_D2I_get_set_type(ASN1_TYPE,ret->value.set,d2i_ASN1_TYPE,
+					ASN1_TYPE_free);
 		}
 	else
 		{
@@ -122,7 +118,7 @@ X509_ATTRIBUTE *d2i_X509_ATTRIBUTE(X509_ATTRIBUTE **a, unsigned char **pp,
 	M_ASN1_D2I_Finish(a,X509_ATTRIBUTE_free,ASN1_F_D2I_X509_ATTRIBUTE);
 	}
 
-X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, char *value)
+X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, void *value)
 	{
 	X509_ATTRIBUTE *ret=NULL;
 	ASN1_TYPE *val=NULL;
@@ -131,9 +127,9 @@ X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, char *value)
 		return(NULL);
 	ret->object=OBJ_nid2obj(nid);
 	ret->set=1;
-	if ((ret->value.set=sk_new_null()) == NULL) goto err;
+	if ((ret->value.set=sk_ASN1_TYPE_new_null()) == NULL) goto err;
 	if ((val=ASN1_TYPE_new()) == NULL) goto err;
-	if (!sk_push(ret->value.set,(char *)val)) goto err;
+	if (!sk_ASN1_TYPE_push(ret->value.set,val)) goto err;
 
 	ASN1_TYPE_set(val,atrtype,value);
 	return(ret);
@@ -161,9 +157,9 @@ void X509_ATTRIBUTE_free(X509_ATTRIBUTE *a)
 	if (a == NULL) return;
 	ASN1_OBJECT_free(a->object);
 	if (a->set)
-		sk_pop_free(a->value.set,ASN1_TYPE_free);
+		sk_ASN1_TYPE_pop_free(a->value.set,ASN1_TYPE_free);
 	else
 		ASN1_TYPE_free(a->value.single);
-	Free((char *)a);
+	OPENSSL_free(a);
 	}