Gitweb:
https://git.exim.org/exim.git/commitdiff/48224640cb97b694c3ea2f159c3e60d64598ba65
Commit: 48224640cb97b694c3ea2f159c3e60d64598ba65
Parent: 02c30a32c6d1aeab0d3bc5f747016041a687c9dd
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Tue Oct 23 23:45:30 2018 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Tue Oct 23 23:45:30 2018 +0100
Tidying: char signedness
---
src/src/arc.c | 4 ++--
src/src/dmarc.c | 2 +-
src/src/macros.h | 2 +-
src/src/pdkim/signing.c | 8 +++----
src/src/tls-gnu.c | 64 ++++++++++++++++++++++++-------------------------
src/src/tls-openssl.c | 8 +++----
src/src/tlscert-gnu.c | 4 ++--
7 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/src/src/arc.c b/src/src/arc.c
index 80bb30e..aa0d1c9 100644
--- a/src/src/arc.c
+++ b/src/src/arc.c
@@ -1605,13 +1605,13 @@ if ((opts = string_nextinlist(&signspec, &sep, NULL, 0)))
if (*(s += 6) == '=')
if (*++s == '+')
{
- if (!(expire = (time_t)atoi(++s)))
+ if (!(expire = (time_t)atoi(CS ++s)))
expire = ARC_SIGN_DEFAULT_EXPIRE_DELTA;
if (!now) now = time(NULL);
expire += now;
}
else
- expire = (time_t)atol(s);
+ expire = (time_t)atol(CS s);
else
{
if (!now) now = time(NULL);
diff --git a/src/src/dmarc.c b/src/src/dmarc.c
index efb2ef0..f29f7eb 100644
--- a/src/src/dmarc.c
+++ b/src/src/dmarc.c
@@ -114,7 +114,7 @@ if (!dmarc_tld_file)
DEBUG(D_receive) debug_printf("DMARC: no dmarc_tld_file\n");
dmarc_abort = TRUE;
}
-else if (opendmarc_tld_read_file(dmarc_tld_file, NULL, NULL, NULL))
+else if (opendmarc_tld_read_file(CS dmarc_tld_file, NULL, NULL, NULL))
{
log_write(0, LOG_MAIN|LOG_PANIC, "DMARC failure to load tld list %s: %d",
dmarc_tld_file, errno);
diff --git a/src/src/macros.h b/src/src/macros.h
index 2e4f6c4..1eff348 100644
--- a/src/src/macros.h
+++ b/src/src/macros.h
@@ -1057,7 +1057,7 @@ should not be one active. */
# define ALARM(seconds) \
debug_selector & D_any \
- ? (sigalarm_setter = CCS __FUNCTION__, alarm(seconds)) : alarm(seconds);
+ ? (sigalarm_setter = CUS __FUNCTION__, alarm(seconds)) : alarm(seconds);
# define ALARM_CLR(seconds) \
debug_selector & D_any \
? (sigalarm_setter = NULL, alarm(seconds)) : alarm(seconds);
diff --git a/src/src/pdkim/signing.c b/src/src/pdkim/signing.c
index 18b357e..7b8a6a0 100644
--- a/src/src/pdkim/signing.c
+++ b/src/src/pdkim/signing.c
@@ -169,13 +169,13 @@ switch(fmt)
{
case KEYFMT_DER:
if ((rc = gnutls_pubkey_import(verify_ctx->key, &k, GNUTLS_X509_FMT_DER)))
- ret = gnutls_strerror(rc);
+ ret = US gnutls_strerror(rc);
break;
#ifdef SIGN_HAVE_ED25519
case KEYFMT_ED25519_BARE:
if ((rc = gnutls_pubkey_import_ecc_raw(verify_ctx->key,
GNUTLS_ECC_CURVE_ED25519, &k, NULL)))
- ret = gnutls_strerror(rc);
+ ret = US gnutls_strerror(rc);
break;
#endif
default:
@@ -203,7 +203,7 @@ if (verify_ctx->keytype == KEYTYPE_ED25519)
{
if ((rc = gnutls_pubkey_verify_data2(verify_ctx->key,
GNUTLS_SIGN_EDDSA_ED25519, 0, &k, &s)) < 0)
- ret = gnutls_strerror(rc);
+ ret = US gnutls_strerror(rc);
}
else
#endif
@@ -218,7 +218,7 @@ else
}
if ((rc = gnutls_pubkey_verify_hash2(verify_ctx->key, algo, 0, &k, &s)) < 0)
- ret = gnutls_strerror(rc);
+ ret = US gnutls_strerror(rc);
}
gnutls_pubkey_deinit(verify_ctx->key);
diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index 50554f2..3e7e8f9 100644
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -266,7 +266,7 @@ before, for now. */
#define exim_gnutls_err_check(rc, Label) do { \
if ((rc) != GNUTLS_E_SUCCESS) \
- return tls_error((Label), gnutls_strerror(rc), host, errstr); \
+ return tls_error((Label), US gnutls_strerror(rc), host, errstr); \
} while (0)
#define expand_check_tlsvar(Varname, errstr) \
@@ -332,11 +332,11 @@ Returns: OK/DEFER/FAIL
*/
static int
-tls_error(const uschar *prefix, const char *msg, const host_item *host,
+tls_error(const uschar *prefix, const uschar *msg, const host_item *host,
uschar ** errstr)
{
if (errstr)
- *errstr = string_sprintf("(%s)%s%s", prefix, msg ? ": " : "", msg ? msg : "");
+ *errstr = string_sprintf("(%s)%s%s", prefix, msg ? ": " : "", msg ? msg : US"");
return host ? FAIL : DEFER;
}
@@ -361,14 +361,14 @@ Returns: nothing
static void
record_io_error(exim_gnutls_state_st *state, int rc, uschar *when, uschar *text)
{
-const char * msg;
+const uschar * msg;
uschar * errstr;
if (rc == GNUTLS_E_FATAL_ALERT_RECEIVED)
- msg = CS string_sprintf("%s: %s", US gnutls_strerror(rc),
+ msg = string_sprintf("%s: %s", US gnutls_strerror(rc),
US gnutls_alert_get_name(gnutls_alert_get(state->session)));
else
- msg = gnutls_strerror(rc);
+ msg = US gnutls_strerror(rc);
(void) tls_error(when, msg, state->host, &errstr);
@@ -561,7 +561,7 @@ else if (Ustrcmp(exp_tls_dhparam, "none") == 0)
else if (exp_tls_dhparam[0] != '/')
{
if (!(m.data = US std_dh_prime_named(exp_tls_dhparam)))
- return tls_error(US"No standard prime named", CS exp_tls_dhparam, NULL, errstr);
+ return tls_error(US"No standard prime named", exp_tls_dhparam, NULL, errstr);
m.size = Ustrlen(m.data);
}
else
@@ -624,7 +624,7 @@ if ((fd = Uopen(filename, O_RDONLY, 0)) >= 0)
{
saved_errno = errno;
(void)close(fd);
- return tls_error(US"TLS cache stat failed", strerror(saved_errno), NULL, errstr);
+ return tls_error(US"TLS cache stat failed", US strerror(saved_errno), NULL, errstr);
}
if (!S_ISREG(statbuf.st_mode))
{
@@ -636,21 +636,21 @@ if ((fd = Uopen(filename, O_RDONLY, 0)) >= 0)
saved_errno = errno;
(void)close(fd);
return tls_error(US"fdopen(TLS cache stat fd) failed",
- strerror(saved_errno), NULL, errstr);
+ US strerror(saved_errno), NULL, errstr);
}
m.size = statbuf.st_size;
if (!(m.data = malloc(m.size)))
{
fclose(fp);
- return tls_error(US"malloc failed", strerror(errno), NULL, errstr);
+ return tls_error(US"malloc failed", US strerror(errno), NULL, errstr);
}
if (!(sz = fread(m.data, m.size, 1, fp)))
{
saved_errno = errno;
fclose(fp);
free(m.data);
- return tls_error(US"fread failed", strerror(saved_errno), NULL, errstr);
+ return tls_error(US"fread failed", US strerror(saved_errno), NULL, errstr);
}
fclose(fp);
@@ -686,11 +686,11 @@ if (rc < 0)
if ((PATH_MAX - Ustrlen(filename)) < 10)
return tls_error(US"Filename too long to generate replacement",
- CS filename, NULL, errstr);
+ filename, NULL, errstr);
- temp_fn = string_copy(US "%s.XXXXXXX");
+ temp_fn = string_copy(US"%s.XXXXXXX");
if ((fd = mkstemp(CS temp_fn)) < 0) /* modifies temp_fn */
- return tls_error(US"Unable to open temp file", strerror(errno), NULL, errstr);
+ return tls_error(US"Unable to open temp file", US strerror(errno), NULL, errstr);
(void)fchown(fd, exim_uid, exim_gid); /* Probably not necessary */
/* GnuTLS overshoots!
@@ -727,7 +727,7 @@ if (rc < 0)
exim_gnutls_err_check(rc, US"gnutls_dh_params_export_pkcs3(NULL) sizing");
m.size = sz;
if (!(m.data = malloc(m.size)))
- return tls_error(US"memory allocation failed", strerror(errno), NULL, errstr);
+ return tls_error(US"memory allocation failed", US strerror(errno), NULL, errstr);
/* this will return a size 1 less than the allocation size above */
rc = gnutls_dh_params_export_pkcs3(dh_server_params, GNUTLS_X509_FMT_PEM,
@@ -743,19 +743,19 @@ if (rc < 0)
{
free(m.data);
return tls_error(US"TLS cache write D-H params failed",
- strerror(errno), NULL, errstr);
+ US strerror(errno), NULL, errstr);
}
free(m.data);
if ((sz = write_to_fd_buf(fd, US"\n", 1)) != 1)
return tls_error(US"TLS cache write D-H params final newline failed",
- strerror(errno), NULL, errstr);
+ US strerror(errno), NULL, errstr);
if ((rc = close(fd)))
- return tls_error(US"TLS cache write close() failed", strerror(errno), NULL, errstr);
+ return tls_error(US"TLS cache write close() failed", US strerror(errno), NULL, errstr);
if (Urename(temp_fn, filename) < 0)
return tls_error(string_sprintf("failed to rename \"%s\" as \"%s\"",
- temp_fn, filename), strerror(errno), NULL, errstr);
+ temp_fn, filename), US strerror(errno), NULL, errstr);
DEBUG(D_tls) debug_printf("wrote D-H parameters to file \"%s\"\n", filename);
}
@@ -828,7 +828,7 @@ out:
return rc;
err:
- rc = tls_error(where, gnutls_strerror(rc), NULL, errstr);
+ rc = tls_error(where, US gnutls_strerror(rc), NULL, errstr);
goto out;
}
@@ -851,7 +851,7 @@ int rc = gnutls_certificate_set_x509_key_file(state->x509_cred,
if (rc < 0)
return tls_error(
string_sprintf("cert/key setup: cert=%s key=%s", certfile, keyfile),
- gnutls_strerror(rc), host, errstr);
+ US gnutls_strerror(rc), host, errstr);
return -rc;
}
@@ -1522,14 +1522,14 @@ if (cert_list == NULL || cert_list_size == 0)
cert_list, cert_list_size);
if (state->verify_requirement >= VERIFY_REQUIRED)
return tls_error(US"certificate verification failed",
- "no certificate received from peer", state->host, errstr);
+ US"no certificate received from peer", state->host, errstr);
return OK;
}
ct = gnutls_certificate_type_get(state->session);
if (ct != GNUTLS_CRT_X509)
{
- const char *ctn = gnutls_certificate_type_get_name(ct);
+ const uschar *ctn = US gnutls_certificate_type_get_name(ct);
DEBUG(D_tls)
debug_printf("TLS: peer cert not X.509 but instead \"%s\"\n", ctn);
if (state->verify_requirement >= VERIFY_REQUIRED)
@@ -1545,7 +1545,7 @@ if (ct != GNUTLS_CRT_X509)
DEBUG(D_tls) debug_printf("TLS: peer cert problem: %s: %s\n", \
(Label), gnutls_strerror(rc)); \
if (state->verify_requirement >= VERIFY_REQUIRED) \
- return tls_error((Label), gnutls_strerror(rc), state->host, errstr); \
+ return tls_error((Label), US gnutls_strerror(rc), state->host, errstr); \
return OK; \
} \
} while (0)
@@ -2022,7 +2022,7 @@ exim_gnutls_state_st * state = NULL;
/* Check for previous activation */
if (tls_in.active.sock >= 0)
{
- tls_error(US"STARTTLS received after TLS started", "", NULL, errstr);
+ tls_error(US"STARTTLS received after TLS started", US "", NULL, errstr);
smtp_printf("554 Already in TLS\r\n", FALSE);
return FAIL;
}
@@ -2115,12 +2115,12 @@ if (rc != GNUTLS_E_SUCCESS)
if (sigalrm_seen)
{
- tls_error(US"gnutls_handshake", "timed out", NULL, errstr);
+ tls_error(US"gnutls_handshake", US"timed out", NULL, errstr);
gnutls_db_remove_session(state->session);
}
else
{
- tls_error(US"gnutls_handshake", gnutls_strerror(rc), NULL, errstr);
+ tls_error(US"gnutls_handshake", US gnutls_strerror(rc), NULL, errstr);
(void) gnutls_alert_send_appropriate(state->session, rc);
gnutls_deinit(state->session);
gnutls_certificate_free_credentials(state->x509_cred);
@@ -2251,7 +2251,7 @@ for (rr = dns_next_rr(dnsa, &dnss, RESET_ANSWERS), i = 0;
}
tls_out.tlsa_usage |= 1<<usage;
- dane_data[i] = p;
+ dane_data[i] = CS p;
dane_data_len[i++] = rr->size;
}
@@ -2403,7 +2403,7 @@ if (request_ocsp)
if ((rc = gnutls_ocsp_status_request_enable_client(state->session,
NULL, 0, NULL)) != OK)
{
- tls_error(US"cert-status-req", gnutls_strerror(rc), state->host, errstr);
+ tls_error(US"cert-status-req", US gnutls_strerror(rc), state->host, errstr);
return NULL;
}
tlsp->ocsp = OCSP_NOT_RESP;
@@ -2438,10 +2438,10 @@ if (rc != GNUTLS_E_SUCCESS)
if (sigalrm_seen)
{
gnutls_alert_send(state->session, GNUTLS_AL_FATAL, GNUTLS_A_USER_CANCELED);
- tls_error(US"gnutls_handshake", "timed out", state->host, errstr);
+ tls_error(US"gnutls_handshake", US"timed out", state->host, errstr);
}
else
- tls_error(US"gnutls_handshake", gnutls_strerror(rc), state->host, errstr);
+ tls_error(US"gnutls_handshake", US gnutls_strerror(rc), state->host, errstr);
return NULL;
}
@@ -2473,7 +2473,7 @@ if (require_ocsp)
gnutls_free(printed.data);
}
else
- (void) tls_error(US"ocsp decode", gnutls_strerror(rc), state->host, errstr);
+ (void) tls_error(US"ocsp decode", US gnutls_strerror(rc), state->host, errstr);
}
if (gnutls_ocsp_status_request_is_checked(state->session, 0) == 0)
diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 28e37e6..982a5ba 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -749,17 +749,17 @@ DEBUG(D_tls)
const uschar * str;
if (where & SSL_ST_CONNECT)
- str = "SSL_connect";
+ str = US"SSL_connect";
else if (where & SSL_ST_ACCEPT)
- str = "SSL_accept";
+ str = US"SSL_accept";
else
- str = "SSL info (undefined)";
+ str = US"SSL info (undefined)";
if (where & SSL_CB_LOOP)
debug_printf("%s: %s\n", str, SSL_state_string_long(s));
else if (where & SSL_CB_ALERT)
debug_printf("SSL3 alert %s:%s:%s\n",
- str = where & SSL_CB_READ ? "read" : "write",
+ str = where & SSL_CB_READ ? US"read" : US"write",
SSL_alert_type_string_long(ret), SSL_alert_desc_string_long(ret));
else if (where & SSL_CB_EXIT)
if (ret == 0)
diff --git a/src/src/tlscert-gnu.c b/src/src/tlscert-gnu.c
index a923da1..9fe8c49 100644
--- a/src/src/tlscert-gnu.c
+++ b/src/src/tlscert-gnu.c
@@ -255,14 +255,14 @@ unsigned int crit;
int ret;
ret = gnutls_x509_crt_get_extension_by_oid ((gnutls_x509_crt_t)cert,
- oid, idx, CS cp1, &siz, &crit);
+ CS oid, idx, CS cp1, &siz, &crit);
if (ret != GNUTLS_E_SHORT_MEMORY_BUFFER)
return g_err("ge0", __FUNCTION__, ret);
cp1 = store_get(siz*4 + 1);
ret = gnutls_x509_crt_get_extension_by_oid ((gnutls_x509_crt_t)cert,
- oid, idx, CS cp1, &siz, &crit);
+ CS oid, idx, CS cp1, &siz, &crit);
if (ret < 0)
return g_err("ge1", __FUNCTION__, ret);
