Commit 82643254 authored by FdaSilvaYY's avatar FdaSilvaYY Committed by Rich Salz
Browse files

Constify X509_TRUST_add method. 



Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1215)
parent bd227450

apps/x509.c

+1 −1
Original line number Diff line number Diff line
@@ -1088,7 +1088,7 @@ static int sign(X509 *x, EVP_PKEY *pkey, int days, int clrext, 
static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt)

{

    int id, i, idret;

    char *pname;

    const char *pname;

    id = X509_PURPOSE_get_id(pt);

    pname = X509_PURPOSE_get0_name(pt);

    for (i = 0; i < 2; i++) {

crypto/x509/x509_trs.c

+4 −4
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int X509_TRUST_set(int *t, int trust) 
}



int X509_TRUST_add(int id, int flags, int (*ck) (X509_TRUST *, X509 *, int),

                   char *name, int arg1, void *arg2)

                   const char *name, int arg1, void *arg2)

{

    int idx;

    X509_TRUST *trtmp;
@@ -201,17 +201,17 @@ void X509_TRUST_cleanup(void) 
    trtable = NULL;

}



int X509_TRUST_get_flags(X509_TRUST *xp)

int X509_TRUST_get_flags(const X509_TRUST *xp)

{

    return xp->flags;

}



char *X509_TRUST_get0_name(X509_TRUST *xp)

char *X509_TRUST_get0_name(const X509_TRUST *xp)

{

    return xp->name;

}



int X509_TRUST_get_trust(X509_TRUST *xp)

int X509_TRUST_get_trust(const X509_TRUST *xp)

{

    return xp->trust;

}

include/openssl/x509.h

+4 −4
Original line number Diff line number Diff line
@@ -989,11 +989,11 @@ int X509_TRUST_get_count(void); 
X509_TRUST *X509_TRUST_get0(int idx);

int X509_TRUST_get_by_id(int id);

int X509_TRUST_add(int id, int flags, int (*ck) (X509_TRUST *, X509 *, int),

                   char *name, int arg1, void *arg2);

                   const char *name, int arg1, void *arg2);

void X509_TRUST_cleanup(void);

int X509_TRUST_get_flags(X509_TRUST *xp);

char *X509_TRUST_get0_name(X509_TRUST *xp);

int X509_TRUST_get_trust(X509_TRUST *xp);

int X509_TRUST_get_flags(const X509_TRUST *xp);

char *X509_TRUST_get0_name(const X509_TRUST *xp);

int X509_TRUST_get_trust(const X509_TRUST *xp);



/* BEGIN ERROR CODES */

/*