projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update test suite so that 'make test' succeeds in 'no-rsa' configuration.
[openssl.git]
/
crypto
/
asn1
/
x_attrib.c
diff --git
a/crypto/asn1/x_attrib.c
b/crypto/asn1/x_attrib.c
index 78a7990c2fe1d2914d27b56e6ecc9756c832ccd8..a874df79db60d3a3f5751921234234d2646ea96d 100644
(file)
--- a/
crypto/asn1/x_attrib.c
+++ b/
crypto/asn1/x_attrib.c
@@
-60,6
+60,7
@@
#include "cryptlib.h"
#include <openssl/objects.h>
#include <openssl/asn1_mac.h>
#include "cryptlib.h"
#include <openssl/objects.h>
#include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
/* sequence */
int i2d_X509_ATTRIBUTE(X509_ATTRIBUTE *a, unsigned char **pp)
/* sequence */
int i2d_X509_ATTRIBUTE(X509_ATTRIBUTE *a, unsigned char **pp)
@@
-84,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_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);
V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET);
else
ret+=i2d_ASN1_TYPE(a->value.single,p);
@@
-105,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_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
{
}
else
{
@@
-116,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);
}
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;
{
X509_ATTRIBUTE *ret=NULL;
ASN1_TYPE *val=NULL;
@@
-125,9
+127,9
@@
X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, char *value)
return(NULL);
ret->object=OBJ_nid2obj(nid);
ret->set=1;
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 ((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);
ASN1_TYPE_set(val,atrtype,value);
return(ret);
@@
-155,9
+157,9
@@
void X509_ATTRIBUTE_free(X509_ATTRIBUTE *a)
if (a == NULL) return;
ASN1_OBJECT_free(a->object);
if (a->set)
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);
else
ASN1_TYPE_free(a->value.single);
- Free(
(char *)
a);
+ Free(a);
}
}