More X509_ATTRIBUTE changes.

[openssl.git] / crypto / asn1 / x_x509a.c

diff --git a/crypto/asn1/x_x509a.c b/crypto/asn1/x_x509a.c
index d8409fbbff34f6d9aaaff96c7dbfeef2aa00f728..6d2ade521cb15fa1fcb00029f003fef922147544 100644 (file)
--- a/crypto/asn1/x_x509a.c
+++ b/crypto/asn1/x_x509a.c
@@ -78,16 +78,12 @@ X509_CERT_AUX *d2i_X509_CERT_AUX(X509_CERT_AUX **a, unsigned char **pp, long len
        M_ASN1_D2I_Init();
        M_ASN1_D2I_start_sequence();
 
-       M_ASN1_D2I_get_opt(ret->trust, d2i_ASN1_BIT_STRING,
-                                                       V_ASN1_BIT_STRING);
-       M_ASN1_D2I_get_IMP_opt(ret->notrust, d2i_ASN1_BIT_STRING,0,
-                                                       V_ASN1_BIT_STRING);
-
-       M_ASN1_D2I_get_seq_opt_type(ASN1_OBJECT, ret->othertrust,
+       M_ASN1_D2I_get_seq_opt_type(ASN1_OBJECT, ret->trust,
                                        d2i_ASN1_OBJECT, ASN1_OBJECT_free);
-       M_ASN1_D2I_get_IMP_set_opt_type(ASN1_OBJECT, ret->othernotrust,
-                                       d2i_ASN1_OBJECT, ASN1_OBJECT_free, 1);
+       M_ASN1_D2I_get_IMP_set_opt_type(ASN1_OBJECT, ret->reject,
+                                       d2i_ASN1_OBJECT, ASN1_OBJECT_free, 0);
        M_ASN1_D2I_get_opt(ret->alias, d2i_ASN1_UTF8STRING, V_ASN1_UTF8STRING);
+       M_ASN1_D2I_get_opt(ret->keyid, d2i_ASN1_OCTET_STRING, V_ASN1_OCTET_STRING);
        M_ASN1_D2I_get_opt(ret->other, d2i_ASN1_TYPE, V_ASN1_SEQUENCE);
 
        M_ASN1_D2I_Finish(a, X509_CERT_AUX_free, ASN1_F_D2I_X509_CERT_AUX);
@@ -99,10 +95,9 @@ X509_CERT_AUX *X509_CERT_AUX_new()
        ASN1_CTX c;
        M_ASN1_New_Malloc(ret, X509_CERT_AUX);
        ret->trust = NULL;
-       ret->notrust = NULL;
-       ret->othertrust = NULL;
-       ret->othernotrust = NULL;
+       ret->reject = NULL;
        ret->alias = NULL;
+       ret->keyid = NULL;
        ret->other = NULL;
        return(ret);
        M_ASN1_New_Error(ASN1_F_X509_CERT_AUX_NEW);
@@ -111,11 +106,10 @@ X509_CERT_AUX *X509_CERT_AUX_new()
 void X509_CERT_AUX_free(X509_CERT_AUX *a)
 {
        if(a == NULL) return;
-       ASN1_BIT_STRING_free(a->trust);
-       ASN1_BIT_STRING_free(a->notrust);
-       sk_ASN1_OBJECT_pop_free(a->othertrust, ASN1_OBJECT_free);
-       sk_ASN1_OBJECT_pop_free(a->othernotrust, ASN1_OBJECT_free);
+       sk_ASN1_OBJECT_pop_free(a->trust, ASN1_OBJECT_free);
+       sk_ASN1_OBJECT_pop_free(a->reject, ASN1_OBJECT_free);
        ASN1_UTF8STRING_free(a->alias);
+       ASN1_OCTET_STRING_free(a->keyid);
        ASN1_TYPE_free(a->other);
        Free((char *)a);
 }
@@ -124,24 +118,20 @@ int i2d_X509_CERT_AUX(X509_CERT_AUX *a, unsigned char **pp)
 {
        M_ASN1_I2D_vars(a);
 
-       M_ASN1_I2D_len(a->trust, i2d_ASN1_BIT_STRING);  
-       M_ASN1_I2D_len_IMP_opt(a->notrust, i2d_ASN1_BIT_STRING);
-
-       M_ASN1_I2D_len_SEQUENCE_opt_type(ASN1_OBJECT, a->othertrust, i2d_ASN1_OBJECT);
-       M_ASN1_I2D_len_IMP_SEQUENCE_opt_type(ASN1_OBJECT, a->othernotrust, i2d_ASN1_OBJECT, 1);
+       M_ASN1_I2D_len_SEQUENCE_opt_type(ASN1_OBJECT, a->trust, i2d_ASN1_OBJECT);
+       M_ASN1_I2D_len_IMP_SEQUENCE_opt_type(ASN1_OBJECT, a->reject, i2d_ASN1_OBJECT, 0);
 
        M_ASN1_I2D_len(a->alias, i2d_ASN1_UTF8STRING);
+       M_ASN1_I2D_len(a->keyid, i2d_ASN1_OCTET_STRING);
        M_ASN1_I2D_len(a->other, i2d_ASN1_TYPE);
 
        M_ASN1_I2D_seq_total();
 
-       M_ASN1_I2D_put(a->trust, i2d_ASN1_BIT_STRING);  
-       M_ASN1_I2D_put_IMP_opt(a->notrust, i2d_ASN1_BIT_STRING, 0);
-
-       M_ASN1_I2D_put_SEQUENCE_opt_type(ASN1_OBJECT, a->othertrust, i2d_ASN1_OBJECT);
-       M_ASN1_I2D_put_IMP_SEQUENCE_opt_type(ASN1_OBJECT, a->othernotrust, i2d_ASN1_OBJECT, 1);
+       M_ASN1_I2D_put_SEQUENCE_opt_type(ASN1_OBJECT, a->trust, i2d_ASN1_OBJECT);
+       M_ASN1_I2D_put_IMP_SEQUENCE_opt_type(ASN1_OBJECT, a->reject, i2d_ASN1_OBJECT, 0);
 
        M_ASN1_I2D_put(a->alias, i2d_ASN1_UTF8STRING);
+       M_ASN1_I2D_put(a->keyid, i2d_ASN1_OCTET_STRING);
        M_ASN1_I2D_put(a->other, i2d_ASN1_TYPE);
 
        M_ASN1_I2D_finish();
@@ -154,7 +144,7 @@ static X509_CERT_AUX *aux_get(X509 *x)
        return x->aux;
 }
 
-int X509_alias_set(X509 *x, unsigned char *name, int len)
+int X509_alias_rset(X509 *x, unsigned char *name, int len)
 {
        X509_CERT_AUX *aux;
        if(!(aux = aux_get(x))) return 0;
@@ -162,58 +152,48 @@ int X509_alias_set(X509 *x, unsigned char *name, int len)
        return ASN1_STRING_set(aux->alias, name, len);
 }
 
-unsigned char *X509_alias_get(X509 *x, int *len)
+unsigned char *X509_alias_iget(X509 *x, int *len)
 {
        if(!x->aux || !x->aux->alias) return NULL;
        if(len) *len = x->aux->alias->length;
        return x->aux->alias->data;
 }
 
-int X509_trust_set_bit(X509 *x, int bit, int value)
+int X509_radd_trust_object(X509 *x, ASN1_OBJECT *obj)
 {
        X509_CERT_AUX *aux;
-       if(bit == -1) {
-               if(x->aux && x->aux->trust) {
-                       ASN1_BIT_STRING_free(x->aux->trust);
-                       x->aux->trust = NULL;
-               }
-               return 1;
-       }
+       ASN1_OBJECT *objtmp;
+       if(!(objtmp = OBJ_dup(obj))) return 0;
        if(!(aux = aux_get(x))) return 0;
-       if(!aux->trust && !(aux->trust = ASN1_BIT_STRING_new())) return 0;
-       return ASN1_BIT_STRING_set_bit(aux->trust, bit, value);
+       if(!aux->trust
+               && !(aux->trust = sk_ASN1_OBJECT_new_null())) return 0;
+       return sk_ASN1_OBJECT_push(aux->trust, objtmp);
 }
 
-int X509_notrust_set_bit(X509 *x, int bit, int value)
+int X509_radd_reject_object(X509 *x, ASN1_OBJECT *obj)
 {
        X509_CERT_AUX *aux;
-       if(bit == -1) {
-               if(x->aux && x->aux->notrust) {
-                       ASN1_BIT_STRING_free(x->aux->notrust);
-                       x->aux->notrust = NULL;
-               }
-               return 1;
-       }
+       ASN1_OBJECT *objtmp;
+       if(!(objtmp = OBJ_dup(obj))) return 0;
        if(!(aux = aux_get(x))) return 0;
-       if(!aux->notrust && !(aux->notrust = ASN1_BIT_STRING_new())) return 0;
-       return ASN1_BIT_STRING_set_bit(aux->notrust, bit, value);
+       if(!aux->reject
+               && !(aux->reject = sk_ASN1_OBJECT_new_null())) return 0;
+       return sk_ASN1_OBJECT_push(aux->reject, objtmp);
 }
 
-int X509_add_trust_object(X509 *x, ASN1_OBJECT *obj)
+void X509_trust_clear(X509 *x)
 {
-       X509_CERT_AUX *aux;
-       if(!(aux = aux_get(x))) return 0;
-       if(!aux->othertrust
-               && !(aux->othertrust = sk_ASN1_OBJECT_new_null())) return 0;
-       return sk_ASN1_OBJECT_push(aux->othertrust, obj);
+       if(x->aux && x->aux->trust) {
+               sk_ASN1_OBJECT_pop_free(x->aux->trust, ASN1_OBJECT_free);
+               x->aux->trust = NULL;
+       }
 }
 
-int X509_add_notrust_object(X509 *x, ASN1_OBJECT *obj)
+void X509_reject_clear(X509 *x)
 {
-       X509_CERT_AUX *aux;
-       if(!(aux = aux_get(x))) return 0;
-       if(!aux->othernotrust
-               && !(aux->othernotrust = sk_ASN1_OBJECT_new_null())) return 0;
-       return sk_ASN1_OBJECT_push(aux->othernotrust, obj);
+       if(x->aux && x->aux->reject) {
+               sk_ASN1_OBJECT_pop_free(x->aux->reject, ASN1_OBJECT_free);
+               x->aux->reject = NULL;
+       }
 }