diff options
author | Adam Langley <agl@chromium.org> | 2014-06-20 23:00:00 +0400 |
---|---|---|
committer | Adam Langley <agl@chromium.org> | 2014-06-21 00:17:36 +0400 |
commit | 735107652b0df9941d60f4259e15150962ca34bb (patch) | |
tree | 46014eb8f570ee70868584da82c54e4f59523319 /crypto/x509 | |
parent | 858a88daf27975f67d9f63e18f95645be2886bfb (diff) |
Const correctness.
This change fixes a number of build warnings.
Diffstat (limited to 'crypto/x509')
-rw-r--r-- | crypto/x509/a_strex.c | 2 | ||||
-rw-r--r-- | crypto/x509/x509_trs.c | 16 | ||||
-rw-r--r-- | crypto/x509/x509_vpm.c | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/crypto/x509/a_strex.c b/crypto/x509/a_strex.c index 92b61ac9..551bcf25 100644 --- a/crypto/x509/a_strex.c +++ b/crypto/x509/a_strex.c @@ -386,7 +386,7 @@ static int do_name_ex(char_io *io_ch, void *arg, X509_NAME *n, char objtmp[80]; const char *objbuf; int outlen, len; - char *sep_dn, *sep_mv, *sep_eq; + const char *sep_dn, *sep_mv, *sep_eq; int sep_dn_len, sep_mv_len, sep_eq_len; if(indent < 0) indent = 0; outlen = indent; diff --git a/crypto/x509/x509_trs.c b/crypto/x509/x509_trs.c index e55b75bb..1a8ed49a 100644 --- a/crypto/x509/x509_trs.c +++ b/crypto/x509/x509_trs.c @@ -76,14 +76,14 @@ static int (*default_trust)(int id, X509 *x, int flags) = obj_trust; */ static X509_TRUST trstandard[] = { -{X509_TRUST_COMPAT, 0, trust_compat, "compatible", 0, NULL}, -{X509_TRUST_SSL_CLIENT, 0, trust_1oidany, "SSL Client", NID_client_auth, NULL}, -{X509_TRUST_SSL_SERVER, 0, trust_1oidany, "SSL Server", NID_server_auth, NULL}, -{X509_TRUST_EMAIL, 0, trust_1oidany, "S/MIME email", NID_email_protect, NULL}, -{X509_TRUST_OBJECT_SIGN, 0, trust_1oidany, "Object Signer", NID_code_sign, NULL}, -{X509_TRUST_OCSP_SIGN, 0, trust_1oid, "OCSP responder", NID_OCSP_sign, NULL}, -{X509_TRUST_OCSP_REQUEST, 0, trust_1oid, "OCSP request", NID_ad_OCSP, NULL}, -{X509_TRUST_TSA, 0, trust_1oidany, "TSA server", NID_time_stamp, NULL} +{X509_TRUST_COMPAT, 0, trust_compat, (char *) "compatible", 0, NULL}, +{X509_TRUST_SSL_CLIENT, 0, trust_1oidany, (char *) "SSL Client", NID_client_auth, NULL}, +{X509_TRUST_SSL_SERVER, 0, trust_1oidany, (char *) "SSL Server", NID_server_auth, NULL}, +{X509_TRUST_EMAIL, 0, trust_1oidany, (char *) "S/MIME email", NID_email_protect, NULL}, +{X509_TRUST_OBJECT_SIGN, 0, trust_1oidany, (char *) "Object Signer", NID_code_sign, NULL}, +{X509_TRUST_OCSP_SIGN, 0, trust_1oid, (char *) "OCSP responder", NID_OCSP_sign, NULL}, +{X509_TRUST_OCSP_REQUEST, 0, trust_1oid, (char *) "OCSP request", NID_ad_OCSP, NULL}, +{X509_TRUST_TSA, 0, trust_1oidany, (char *) "TSA server", NID_time_stamp, NULL} }; #define X509_TRUST_COUNT (sizeof(trstandard)/sizeof(X509_TRUST)) diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c index 25b09875..cf9bed01 100644 --- a/crypto/x509/x509_vpm.c +++ b/crypto/x509/x509_vpm.c @@ -443,7 +443,7 @@ static X509_VERIFY_PARAM_ID _empty_id = {NULL, 0, NULL, 0, NULL, 0}; static const X509_VERIFY_PARAM default_table[] = { { - "default", /* X509 default parameters */ + (char *) "default", /* X509 default parameters */ 0, /* Check time */ 0, /* internal flags */ 0, /* flags */ @@ -454,7 +454,7 @@ static const X509_VERIFY_PARAM default_table[] = { vpm_empty_id }, { - "pkcs7", /* S/MIME sign parameters */ + (char *) "pkcs7", /* S/MIME sign parameters */ 0, /* Check time */ 0, /* internal flags */ 0, /* flags */ @@ -465,7 +465,7 @@ static const X509_VERIFY_PARAM default_table[] = { vpm_empty_id }, { - "smime_sign", /* S/MIME sign parameters */ + (char *) "smime_sign", /* S/MIME sign parameters */ 0, /* Check time */ 0, /* internal flags */ 0, /* flags */ @@ -476,7 +476,7 @@ static const X509_VERIFY_PARAM default_table[] = { vpm_empty_id }, { - "ssl_client", /* SSL/TLS client parameters */ + (char *) "ssl_client", /* SSL/TLS client parameters */ 0, /* Check time */ 0, /* internal flags */ 0, /* flags */ @@ -487,7 +487,7 @@ static const X509_VERIFY_PARAM default_table[] = { vpm_empty_id }, { - "ssl_server", /* SSL/TLS server parameters */ + (char *) "ssl_server", /* SSL/TLS server parameters */ 0, /* Check time */ 0, /* internal flags */ 0, /* flags */ |