Commit 4392479c authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

embed value field of X509_EXTENSION 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 272d917d

crypto/x509/x509_lcl.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct x509_attributes_st { 
struct X509_extension_st {

    ASN1_OBJECT *object;

    ASN1_BOOLEAN critical;

    ASN1_OCTET_STRING *value;

    ASN1_OCTET_STRING value;

};



/*

crypto/x509/x509_v3.c

+2 −2
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ int X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data) 


    if (ex == NULL)

        return (0);

    i = ASN1_OCTET_STRING_set(ex->value, data->data, data->length);

    i = ASN1_OCTET_STRING_set(&ex->value, data->data, data->length);

    if (!i)

        return (0);

    return (1);
@@ -270,7 +270,7 @@ ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ex) 
{

    if (ex == NULL)

        return (NULL);

    return (ex->value);

    return &ex->value;

}



int X509_EXTENSION_get_critical(X509_EXTENSION *ex)

crypto/x509/x_exten.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
ASN1_SEQUENCE(X509_EXTENSION) = {

        ASN1_SIMPLE(X509_EXTENSION, object, ASN1_OBJECT),

        ASN1_OPT(X509_EXTENSION, critical, ASN1_BOOLEAN),

        ASN1_SIMPLE(X509_EXTENSION, value, ASN1_OCTET_STRING)

        ASN1_EMBED(X509_EXTENSION, value, ASN1_OCTET_STRING)

} ASN1_SEQUENCE_END(X509_EXTENSION)



ASN1_ITEM_TEMPLATE(X509_EXTENSIONS) =