Commit c47ba4e9 authored by FdaSilvaYY's avatar FdaSilvaYY Committed by Richard Levitte
Browse files

Constify some ASN1_OBJECT *obj input parameters 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent cfc5e0aa

crypto/cms/cms_att.c

+4 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ int CMS_signed_get_attr_by_NID(const CMS_SignerInfo *si, int nid, int lastpos) 
    return X509at_get_attr_by_NID(si->signedAttrs, nid, lastpos);

}



int CMS_signed_get_attr_by_OBJ(const CMS_SignerInfo *si, ASN1_OBJECT *obj,

int CMS_signed_get_attr_by_OBJ(const CMS_SignerInfo *si, const ASN1_OBJECT *obj,

                               int lastpos)

{

    return X509at_get_attr_by_OBJ(si->signedAttrs, obj, lastpos);
@@ -75,7 +75,7 @@ int CMS_signed_add1_attr_by_txt(CMS_SignerInfo *si, 
    return 0;

}



void *CMS_signed_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,

void *CMS_signed_get0_data_by_OBJ(CMS_SignerInfo *si, const ASN1_OBJECT *oid,

                                  int lastpos, int type)

{

    return X509at_get0_data_by_OBJ(si->signedAttrs, oid, lastpos, type);
@@ -92,8 +92,8 @@ int CMS_unsigned_get_attr_by_NID(const CMS_SignerInfo *si, int nid, 
    return X509at_get_attr_by_NID(si->unsignedAttrs, nid, lastpos);

}



int CMS_unsigned_get_attr_by_OBJ(const CMS_SignerInfo *si, ASN1_OBJECT *obj,

                                 int lastpos)

int CMS_unsigned_get_attr_by_OBJ(const CMS_SignerInfo *si,

                                 const ASN1_OBJECT *obj, int lastpos)

{

    return X509at_get_attr_by_OBJ(si->unsignedAttrs, obj, lastpos);

}

crypto/evp/evp_pkey.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ int EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, int lastpos) 
    return X509at_get_attr_by_NID(key->attributes, nid, lastpos);

}



int EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, ASN1_OBJECT *obj,

int EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj,

                             int lastpos)

{

    return X509at_get_attr_by_OBJ(key->attributes, obj, lastpos);

crypto/ocsp/ocsp_ext.c

+5 −4
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ int OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos) 
            (x->tbsRequest.requestExtensions, nid, lastpos));

}



int OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, ASN1_OBJECT *obj,

int OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, const ASN1_OBJECT *obj,

                                int lastpos)

{

    return (X509v3_get_ext_by_OBJ
@@ -84,7 +84,8 @@ int OCSP_ONEREQ_get_ext_by_NID(OCSP_ONEREQ *x, int nid, int lastpos) 
    return (X509v3_get_ext_by_NID(x->singleRequestExtensions, nid, lastpos));

}



int OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, ASN1_OBJECT *obj, int lastpos)

int OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, const ASN1_OBJECT *obj,

                               int lastpos)

{

    return (X509v3_get_ext_by_OBJ(x->singleRequestExtensions, obj, lastpos));

}
@@ -135,7 +136,7 @@ int OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos) 
            (x->tbsResponseData.responseExtensions, nid, lastpos));

}



int OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, ASN1_OBJECT *obj,

int OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, const ASN1_OBJECT *obj,

                                  int lastpos)

{

    return (X509v3_get_ext_by_OBJ
@@ -191,7 +192,7 @@ int OCSP_SINGLERESP_get_ext_by_NID(OCSP_SINGLERESP *x, int nid, int lastpos) 
    return (X509v3_get_ext_by_NID(x->singleExtensions, nid, lastpos));

}



int OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, ASN1_OBJECT *obj,

int OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, const ASN1_OBJECT *obj,

                                   int lastpos)

{

    return (X509v3_get_ext_by_OBJ(x->singleExtensions, obj, lastpos));

crypto/ts/ts_req_utils.c

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ ASN1_OCTET_STRING *TS_MSG_IMPRINT_get_msg(TS_MSG_IMPRINT *a) 
    return a->hashed_msg;

}



int TS_REQ_set_policy_id(TS_REQ *a, ASN1_OBJECT *policy)

int TS_REQ_set_policy_id(TS_REQ *a, const ASN1_OBJECT *policy)

{

    ASN1_OBJECT *new_policy;
@@ -152,7 +152,7 @@ int TS_REQ_get_ext_by_NID(TS_REQ *a, int nid, int lastpos) 
    return X509v3_get_ext_by_NID(a->extensions, nid, lastpos);

}



int TS_REQ_get_ext_by_OBJ(TS_REQ *a, ASN1_OBJECT *obj, int lastpos)

int TS_REQ_get_ext_by_OBJ(TS_REQ *a, const ASN1_OBJECT *obj, int lastpos)

{

    return X509v3_get_ext_by_OBJ(a->extensions, obj, lastpos);

}

crypto/ts/ts_rsp_sign.c

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ int TS_RESP_CTX_set_signer_digest(TS_RESP_CTX *ctx, const EVP_MD *md) 
    return 1;

}



int TS_RESP_CTX_set_def_policy(TS_RESP_CTX *ctx, ASN1_OBJECT *def_policy)

int TS_RESP_CTX_set_def_policy(TS_RESP_CTX *ctx, const ASN1_OBJECT *def_policy)

{

    ASN1_OBJECT_free(ctx->default_policy);

    if ((ctx->default_policy = OBJ_dup(def_policy)) == NULL)
@@ -199,7 +199,7 @@ int TS_RESP_CTX_set_certs(TS_RESP_CTX *ctx, STACK_OF(X509) *certs) 
    return 1;

}



int TS_RESP_CTX_add_policy(TS_RESP_CTX *ctx, ASN1_OBJECT *policy)

int TS_RESP_CTX_add_policy(TS_RESP_CTX *ctx, const ASN1_OBJECT *policy)

{

    ASN1_OBJECT *copy = NULL;