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

Constify some inputs buffers 



remove useless cast to call ASN1_STRING_set

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 35da893f

crypto/asn1/a_gentm.c

+1 −2
Original line number Diff line number Diff line
@@ -148,8 +148,7 @@ int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str) 
    t.data = (unsigned char *)str;

    if (ASN1_GENERALIZEDTIME_check(&t)) {

        if (s != NULL) {

            if (!ASN1_STRING_set((ASN1_STRING *)s,

                                 (unsigned char *)str, t.length))

            if (!ASN1_STRING_set((ASN1_STRING *)s, str, t.length))

                return 0;

            s->type = V_ASN1_GENERALIZEDTIME;

        }

crypto/asn1/a_utctm.c

+1 −2
Original line number Diff line number Diff line
@@ -119,8 +119,7 @@ int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str) 
    t.data = (unsigned char *)str;

    if (ASN1_UTCTIME_check(&t)) {

        if (s != NULL) {

            if (!ASN1_STRING_set((ASN1_STRING *)s,

                                 (unsigned char *)str, t.length))

            if (!ASN1_STRING_set((ASN1_STRING *)s, str, t.length))

                return 0;

            s->type = V_ASN1_UTCTIME;

        }

crypto/ocsp/ocsp_ext.c

+2 −2
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ int OCSP_copy_nonce(OCSP_BASICRESP *resp, OCSP_REQUEST *req) 
    return OCSP_BASICRESP_add_ext(resp, req_ext, -1);

}



X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim)

X509_EXTENSION *OCSP_crlID_new(const char *url, long *n, char *tim)

{

    X509_EXTENSION *x = NULL;

    OCSP_CRLID *cid = NULL;
@@ -430,7 +430,7 @@ X509_EXTENSION *OCSP_archive_cutoff_new(char *tim) 
 * two--NID_ad_ocsp, NID_id_ad_caIssuers--and GeneralName value.  This method

 * forces NID_ad_ocsp and uniformResourceLocator [6] IA5String.

 */

X509_EXTENSION *OCSP_url_svcloc_new(X509_NAME *issuer, char **urls)

X509_EXTENSION *OCSP_url_svcloc_new(X509_NAME *issuer, const char **urls)

{

    X509_EXTENSION *x = NULL;

    ASN1_IA5STRING *ia5 = NULL;

crypto/x509/x_x509a.c

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static X509_CERT_AUX *aux_get(X509 *x) 
    return x->aux;

}



int X509_alias_set1(X509 *x, unsigned char *name, int len)

int X509_alias_set1(X509 *x, const unsigned char *name, int len)

{

    X509_CERT_AUX *aux;

    if (!name) {
@@ -64,7 +64,7 @@ int X509_alias_set1(X509 *x, unsigned char *name, int len) 
    return ASN1_STRING_set(aux->alias, name, len);

}



int X509_keyid_set1(X509 *x, unsigned char *id, int len)

int X509_keyid_set1(X509 *x, const unsigned char *id, int len)

{

    X509_CERT_AUX *aux;

    if (!id) {

include/openssl/ocsp.h

+2 −2
Original line number Diff line number Diff line
@@ -260,13 +260,13 @@ int OCSP_basic_sign(OCSP_BASICRESP *brsp, 
                    X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,

                    STACK_OF(X509) *certs, unsigned long flags);



X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);

X509_EXTENSION *OCSP_crlID_new(const char *url, long *n, char *tim);



X509_EXTENSION *OCSP_accept_responses_new(char **oids);



X509_EXTENSION *OCSP_archive_cutoff_new(char *tim);



X509_EXTENSION *OCSP_url_svcloc_new(X509_NAME *issuer, char **urls);

X509_EXTENSION *OCSP_url_svcloc_new(X509_NAME *issuer, const char **urls);



int OCSP_REQUEST_get_ext_count(OCSP_REQUEST *x);

int OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos);