Constify X509_TRUST_add method.

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1215)

diff --git a/apps/x509.c b/apps/x509.c
index 64197665d0eac9c597a4d1ef1ae80e75910c0fb7..0753817257cc7e40430abc0e2d6f33843f309ff9 100644 (file)
--- 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;
 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++) {
     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 d736418cbe645348c0f060bacf4b499fce371a74..f7d89bfd8362f22dfe2c23bc2e5199c1e09df014 100644 (file)
--- 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),
 }
 
 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;
 {
     int idx;
     X509_TRUST *trtmp;


@@ -201,17 +201,17 @@ void X509_TRUST_cleanup(void)
     trtable = NULL;
 }
 
     trtable = NULL;
 }
 

-int X509_TRUST_get_flags(X509_TRUST *xp)
+int X509_TRUST_get_flags(const X509_TRUST *xp)

 {
     return xp->flags;
 }
 
 {
     return xp->flags;
 }
 

-char *X509_TRUST_get0_name(X509_TRUST *xp)
+char *X509_TRUST_get0_name(const X509_TRUST *xp)

 {
     return xp->name;
 }
 
 {
     return xp->name;
 }
 

-int X509_TRUST_get_trust(X509_TRUST *xp)
+int X509_TRUST_get_trust(const X509_TRUST *xp)

 {
     return xp->trust;
 }
 {
     return xp->trust;
 }

diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index 906184a5d841ccc5859d2087ee72bc7d92883766..3c364dde013e910a140ba00267f9e755c3a59997 100644 (file)
--- 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),
 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);
 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 */
 /*
 
 /* BEGIN ERROR CODES */
 /*