From 82643254d6d85e7875dbba0df85cea8751b1c3a0 Mon Sep 17 00:00:00 2001 From: FdaSilvaYY Date: Wed, 8 Jun 2016 00:05:05 +0200 Subject: [PATCH] Constify X509_TRUST_add method. Reviewed-by: Kurt Roeckx Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/1215) --- apps/x509.c | 2 +- crypto/x509/x509_trs.c | 8 ++++---- include/openssl/x509.h | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/x509.c b/apps/x509.c index 64197665d0..0753817257 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -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++) { diff --git a/crypto/x509/x509_trs.c b/crypto/x509/x509_trs.c index d736418cbe..f7d89bfd83 100644 --- a/crypto/x509/x509_trs.c +++ b/crypto/x509/x509_trs.c @@ -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; } diff --git a/include/openssl/x509.h b/include/openssl/x509.h index 906184a5d8..3c364dde01 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -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 */ /* -- 2.34.1