Fix d4a4370050f7d72239b92a60ab9d4a2dd5e9fd84

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

diff --git a/crypto/asn1/x_x509a.c b/crypto/asn1/x_x509a.c
index f244768b7e1dd3d0610382ad9d44f1447dfe1992..03a9c45aeb8ebeaee1558b47ff5cc9d98ebd9257 100644 (file)
--- a/crypto/asn1/x_x509a.c
+++ b/crypto/asn1/x_x509a.c
@@ -1,5 +1,5 @@
 /* a_x509a.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
 /* ====================================================================
@@ -91,6 +91,14 @@ static X509_CERT_AUX *aux_get(X509 *x)
 int X509_alias_set1(X509 *x, unsigned char *name, int len)
 {
        X509_CERT_AUX *aux;
+       if (!name)
+               {
+               if (!x || !x->aux || !x->aux->alias)
+                       return 1;
+               ASN1_UTF8STRING_free(x->aux->alias);
+               x->aux->alias = NULL;
+               return 1;
+               }
        if(!(aux = aux_get(x))) return 0;
        if(!aux->alias && !(aux->alias = ASN1_UTF8STRING_new())) return 0;
        return ASN1_STRING_set(aux->alias, name, len);
@@ -99,6 +107,14 @@ int X509_alias_set1(X509 *x, unsigned char *name, int len)
 int X509_keyid_set1(X509 *x, unsigned char *id, int len)
 {
        X509_CERT_AUX *aux;
+       if (!id)
+               {
+               if (!x || !x->aux || !x->aux->keyid)
+                       return 1;
+               ASN1_OCTET_STRING_free(x->aux->keyid);
+               x->aux->keyid = NULL;
+               return 1;
+               }
        if(!(aux = aux_get(x))) return 0;
        if(!aux->keyid && !(aux->keyid = ASN1_OCTET_STRING_new())) return 0;
        return ASN1_STRING_set(aux->keyid, id, len);
@@ -111,17 +127,35 @@ unsigned char *X509_alias_get0(X509 *x, int *len)
        return x->aux->alias->data;
 }
 
-int X509_add1_trust_object(X509 *x, ASN1_OBJECT *obj)
+unsigned char *X509_keyid_get0(X509 *x, int *len)
 {
-       X509_CERT_AUX *aux;
-       ASN1_OBJECT *objtmp;
-       if(!(objtmp = OBJ_dup(obj))) return 0;
-       if(!(aux = aux_get(x))) return 0;
-       if(!aux->trust
-               && !(aux->trust = sk_ASN1_OBJECT_new_null())) return 0;
-       return sk_ASN1_OBJECT_push(aux->trust, objtmp);
+       if(!x->aux || !x->aux->keyid) return NULL;
+       if(len) *len = x->aux->keyid->length;
+       return x->aux->keyid->data;
 }
 
+int X509_add1_trust_object(X509 *x, ASN1_OBJECT *obj)
+       {
+       X509_CERT_AUX *aux;
+       ASN1_OBJECT *objtmp = NULL;
+       if (obj)
+               {
+               objtmp = OBJ_dup(obj);
+               if (!objtmp)
+                       return 0;
+               }
+       if(!(aux = aux_get(x)))
+               goto err;
+       if(!aux->trust && !(aux->trust = sk_ASN1_OBJECT_new_null()))
+                       goto err;
+       if (!objtmp || sk_ASN1_OBJECT_push(aux->trust, objtmp))
+               return 1;
+       err:
+       if (objtmp)
+               ASN1_OBJECT_free(objtmp);
+       return 0;
+       }
+
 int X509_add1_reject_object(X509 *x, ASN1_OBJECT *obj)
 {
        X509_CERT_AUX *aux;
@@ -149,3 +183,9 @@ void X509_reject_clear(X509 *x)
        }
 }
 
+ASN1_SEQUENCE(X509_CERT_PAIR) = {
+       ASN1_EXP_OPT(X509_CERT_PAIR, forward, X509, 0),
+       ASN1_EXP_OPT(X509_CERT_PAIR, reverse, X509, 1)
+} ASN1_SEQUENCE_END(X509_CERT_PAIR)
+
+IMPLEMENT_ASN1_FUNCTIONS(X509_CERT_PAIR)