Commit 95ed0e7c authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Embed X509_REQ_INFO 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 5cf6abd8

crypto/asn1/t_req.c

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, 
    if (nmflags == X509_FLAG_COMPAT)

        nmindent = 16;



    ri = x->req_info;

    ri = &x->req_info;

    if (!(cflag & X509_FLAG_NO_HEADER)) {

        if (BIO_write(bp, "Certificate Request:\n", 21) <= 0)

            goto err;
@@ -153,7 +153,7 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, 
        if (BIO_printf(bp, "%8sAttributes:\n", "") <= 0)

            goto err;



        sk = x->req_info->attributes;

        sk = x->req_info.attributes;

        if (sk_X509_ATTRIBUTE_num(sk) == 0) {

            if (BIO_printf(bp, "%12sa0:00\n", "") <= 0)

                goto err;

crypto/asn1/x_req.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ ASN1_SEQUENCE_enc(X509_REQ_INFO, enc, rinf_cb) = { 
IMPLEMENT_ASN1_FUNCTIONS(X509_REQ_INFO)



ASN1_SEQUENCE_ref(X509_REQ, 0, CRYPTO_LOCK_X509_REQ) = {

        ASN1_SIMPLE(X509_REQ, req_info, X509_REQ_INFO),

        ASN1_EMBED(X509_REQ, req_info, X509_REQ_INFO),

        ASN1_SIMPLE(X509_REQ, sig_alg, X509_ALGOR),

        ASN1_SIMPLE(X509_REQ, signature, ASN1_BIT_STRING)

} ASN1_SEQUENCE_END_ref(X509_REQ, X509_REQ)

crypto/include/internal/x509_int.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ struct X509_req_info_st { 
};



struct X509_req_st {

    X509_REQ_INFO *req_info;

    X509_REQ_INFO req_info;

    X509_ALGOR *sig_alg;

    ASN1_BIT_STRING *signature;

    int references;

crypto/x509/x509_r2x.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey) 
    /* duplicate the request */

    xi = &ret->cert_info;



    if (sk_X509_ATTRIBUTE_num(r->req_info->attributes) != 0) {

    if (sk_X509_ATTRIBUTE_num(r->req_info.attributes) != 0) {

        if ((xi->version = ASN1_INTEGER_new()) == NULL)

            goto err;

        if (!ASN1_INTEGER_set(xi->version, 2))

crypto/x509/x509_req.c

+15 −15
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md) 
        goto err;

    }



    ri = ret->req_info;

    ri = &ret->req_info;



    ri->version->length = 1;

    ri->version->data = OPENSSL_malloc(1);
@@ -112,9 +112,9 @@ X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md) 


EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *req)

{

    if ((req == NULL) || (req->req_info == NULL))

    if (req == NULL)

        return (NULL);

    return (X509_PUBKEY_get(req->req_info->pubkey));

    return (X509_PUBKEY_get(req->req_info.pubkey));

}



int X509_REQ_check_private_key(X509_REQ *x, EVP_PKEY *k)
@@ -195,7 +195,7 @@ STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(X509_REQ *req) 
    int idx, *pnid;

    const unsigned char *p;



    if ((req == NULL) || (req->req_info == NULL) || !ext_nids)

    if ((req == NULL) || !ext_nids)

        return (NULL);

    for (pnid = ext_nids; *pnid != NID_undef; pnid++) {

        idx = X509_REQ_get_attr_by_NID(req, *pnid, -1);
@@ -244,33 +244,33 @@ int X509_REQ_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) 


int X509_REQ_get_attr_count(const X509_REQ *req)

{

    return X509at_get_attr_count(req->req_info->attributes);

    return X509at_get_attr_count(req->req_info.attributes);

}



int X509_REQ_get_attr_by_NID(const X509_REQ *req, int nid, int lastpos)

{

    return X509at_get_attr_by_NID(req->req_info->attributes, nid, lastpos);

    return X509at_get_attr_by_NID(req->req_info.attributes, nid, lastpos);

}



int X509_REQ_get_attr_by_OBJ(const X509_REQ *req, ASN1_OBJECT *obj,

                             int lastpos)

{

    return X509at_get_attr_by_OBJ(req->req_info->attributes, obj, lastpos);

    return X509at_get_attr_by_OBJ(req->req_info.attributes, obj, lastpos);

}



X509_ATTRIBUTE *X509_REQ_get_attr(const X509_REQ *req, int loc)

{

    return X509at_get_attr(req->req_info->attributes, loc);

    return X509at_get_attr(req->req_info.attributes, loc);

}



X509_ATTRIBUTE *X509_REQ_delete_attr(X509_REQ *req, int loc)

{

    return X509at_delete_attr(req->req_info->attributes, loc);

    return X509at_delete_attr(req->req_info.attributes, loc);

}



int X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr)

{

    if (X509at_add1_attr(&req->req_info->attributes, attr))

    if (X509at_add1_attr(&req->req_info.attributes, attr))

        return 1;

    return 0;

}
@@ -279,7 +279,7 @@ int X509_REQ_add1_attr_by_OBJ(X509_REQ *req, 
                              const ASN1_OBJECT *obj, int type,

                              const unsigned char *bytes, int len)

{

    if (X509at_add1_attr_by_OBJ(&req->req_info->attributes, obj,

    if (X509at_add1_attr_by_OBJ(&req->req_info.attributes, obj,

                                type, bytes, len))

        return 1;

    return 0;
@@ -289,7 +289,7 @@ int X509_REQ_add1_attr_by_NID(X509_REQ *req, 
                              int nid, int type,

                              const unsigned char *bytes, int len)

{

    if (X509at_add1_attr_by_NID(&req->req_info->attributes, nid,

    if (X509at_add1_attr_by_NID(&req->req_info.attributes, nid,

                                type, bytes, len))

        return 1;

    return 0;
@@ -299,7 +299,7 @@ int X509_REQ_add1_attr_by_txt(X509_REQ *req, 
                              const char *attrname, int type,

                              const unsigned char *bytes, int len)

{

    if (X509at_add1_attr_by_txt(&req->req_info->attributes, attrname,

    if (X509at_add1_attr_by_txt(&req->req_info.attributes, attrname,

                                type, bytes, len))

        return 1;

    return 0;
@@ -307,10 +307,10 @@ int X509_REQ_add1_attr_by_txt(X509_REQ *req, 


long X509_REQ_get_version(X509_REQ *req)

{

    return ASN1_INTEGER_get(req->req_info->version);

    return ASN1_INTEGER_get(req->req_info.version);

}



X509_NAME *X509_REQ_get_subject_name(X509_REQ *req)

{

    return req->req_info->subject;

    return req->req_info.subject;

}