Gitweb:
https://git.exim.org/exim.git/commitdiff/1f20760b17087817459e6c6baffa28de4b7d5aa2
Commit: 1f20760b17087817459e6c6baffa28de4b7d5aa2
Parent: d7f31bb61bd2255d45470d238680ac53eca62264
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Jan 5 18:51:19 2019 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sun Feb 10 23:57:57 2019 +0000
constification
(cherry picked from commit e8a25e05698e39a45cf5f188476808ef3609dbdd)
---
src/src/auths/cram_md5.c | 2 +-
src/src/auths/get_data.c | 2 +-
src/src/base64.c | 2 +-
src/src/expand.c | 10 +++++-----
src/src/functions.h | 4 ++--
src/src/lss.c | 4 ++--
src/src/pdkim/pdkim.c | 2 +-
src/src/tls-gnu.c | 12 ++++++------
src/src/tlscert-gnu.c | 2 +-
src/src/tlscert-openssl.c | 2 +-
10 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/src/auths/cram_md5.c b/src/src/auths/cram_md5.c
index 188ac46..b1c5610 100644
--- a/src/src/auths/cram_md5.c
+++ b/src/src/auths/cram_md5.c
@@ -321,7 +321,7 @@ in big_buffer, but b64encode() returns its result in working store,
so calling smtp_write_command(), which uses big_buffer, is OK. */
buffer[0] = 0;
-if (smtp_write_command(sx, SCMD_FLUSH, "%s\r\n", b64encode(big_buffer,
+if (smtp_write_command(sx, SCMD_FLUSH, "%s\r\n", b64encode(CUS big_buffer,
p - big_buffer)) < 0) return FAIL_SEND;
return smtp_read_response(sx, US buffer, buffsize, '2', timeout)
diff --git a/src/src/auths/get_data.c b/src/src/auths/get_data.c
index 7d974ab..00ea9e5 100644
--- a/src/src/auths/get_data.c
+++ b/src/src/auths/get_data.c
@@ -26,7 +26,7 @@ Returns: OK on success
*/
int
-auth_get_data(uschar **aptr, uschar *challenge, int challen)
+auth_get_data(uschar **aptr, const uschar * challenge, int challen)
{
int c;
int p = 0;
diff --git a/src/src/base64.c b/src/src/base64.c
index f3c4584..289383b 100644
--- a/src/src/base64.c
+++ b/src/src/base64.c
@@ -242,7 +242,7 @@ static uschar *enc64table =
US"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
uschar *
-b64encode(uschar *clear, int len)
+b64encode(const uschar * clear, int len)
{
uschar *code = store_get(4*((len+2)/3) + 1);
uschar *p = code;
diff --git a/src/src/expand.c b/src/src/expand.c
index a39454c..4dc13ff 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -2737,7 +2737,7 @@ switch(cond_type)
if (sublen == 24)
{
- uschar *coded = b64encode(digest, 16);
+ uschar *coded = b64encode(CUS digest, 16);
DEBUG(D_auth) debug_printf("crypteq: using MD5+B64 hashing\n"
" subject=%s\n crypted=%s\n", coded, sub[1]+5);
tempcond = (Ustrcmp(coded, sub[1]+5) == 0);
@@ -2774,7 +2774,7 @@ switch(cond_type)
if (sublen == 28)
{
- uschar *coded = b64encode(digest, 20);
+ uschar *coded = b64encode(CUS digest, 20);
DEBUG(D_auth) debug_printf("crypteq: using SHA1+B64 hashing\n"
" subject=%s\n crypted=%s\n", coded, sub[1]+6);
tempcond = (Ustrcmp(coded, sub[1]+6) == 0);
@@ -6843,7 +6843,7 @@ while (*s != 0)
}
}
- enc = b64encode(sub, out - sub);
+ enc = b64encode(CUS sub, out - sub);
yield = string_cat(yield, enc);
continue;
}
@@ -7507,9 +7507,9 @@ while (*s != 0)
#ifdef SUPPORT_TLS
uschar * s = vp && *(void **)vp->value
? tls_cert_der_b64(*(void **)vp->value)
- : b64encode(sub, Ustrlen(sub));
+ : b64encode(CUS sub, Ustrlen(sub));
#else
- uschar * s = b64encode(sub, Ustrlen(sub));
+ uschar * s = b64encode(CUS sub, Ustrlen(sub));
#endif
yield = string_cat(yield, s);
continue;
diff --git a/src/src/functions.h b/src/src/functions.h
index cab7a73..8668656 100644
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -108,7 +108,7 @@ extern int auth_check_serv_cond(auth_instance *);
extern int auth_check_some_cond(auth_instance *, uschar *, uschar *, int);
-extern int auth_get_data(uschar **, uschar *, int);
+extern int auth_get_data(uschar **, const uschar *, int);
extern int auth_get_no64_data(uschar **, uschar *);
extern void auth_show_supported(FILE *);
extern uschar *auth_xtextencode(uschar *, int);
@@ -128,7 +128,7 @@ extern gstring *authres_smtpauth(gstring *);
extern gstring *authres_spf(gstring *);
#endif
-extern uschar *b64encode(uschar *, int);
+extern uschar *b64encode(const uschar *, int);
extern int b64decode(const uschar *, uschar **);
extern int bdat_getc(unsigned);
extern uschar *bdat_getbuf(unsigned *);
diff --git a/src/src/lss.c b/src/src/lss.c
index 59cbd7f..167522d 100644
--- a/src/src/lss.c
+++ b/src/src/lss.c
@@ -115,9 +115,9 @@ Returns: a pointer to the zero-terminated base 64 string, which
*/
uschar *
-lss_b64encode(uschar *clear, int len)
+lss_b64encode(uschar * clear, int len)
{
-return b64encode(clear, len);
+return b64encode(CUS clear, len);
}
/*
diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
index d056402..6e154f5 100644
--- a/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@ -445,7 +445,7 @@ b->len = dlen;
uschar *
pdkim_encode_base64(blob * b)
{
-return b64encode(b->data, b->len);
+return b64encode(CUS b->data, b->len);
}
diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index 823b897..f8d3580 100644
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -475,16 +475,16 @@ tls_channelbinding_b64 = NULL;
#ifdef HAVE_GNUTLS_SESSION_CHANNEL_BINDING
channel.data = NULL;
channel.size = 0;
-rc = gnutls_session_channel_binding(state->session, GNUTLS_CB_TLS_UNIQUE, &channel);
-if (rc) {
- DEBUG(D_tls) debug_printf("Channel binding error: %s\n", gnutls_strerror(rc));
-} else {
+if ((rc = gnutls_session_channel_binding(state->session, GNUTLS_CB_TLS_UNIQUE, &channel)))
+ { DEBUG(D_tls) debug_printf("Channel binding error: %s\n", gnutls_strerror(rc)); }
+else
+ {
old_pool = store_pool;
store_pool = POOL_PERM;
- tls_channelbinding_b64 = b64encode(channel.data, (int)channel.size);
+ tls_channelbinding_b64 = b64encode(CUS channel.data, (int)channel.size);
store_pool = old_pool;
DEBUG(D_tls) debug_printf("Have channel bindings cached for possible auth usage.\n");
-}
+ }
#endif
/* peercert is set in peer_status() */
diff --git a/src/src/tlscert-gnu.c b/src/src/tlscert-gnu.c
index 572f971..cebeae5 100644
--- a/src/src/tlscert-gnu.c
+++ b/src/src/tlscert-gnu.c
@@ -429,7 +429,7 @@ if ( (fail = gnutls_x509_crt_export((gnutls_x509_crt_t)cert,
gnutls_strerror(fail));
return NULL;
}
-return b64encode(cp, (int)len);
+return b64encode(CUS cp, (int)len);
}
diff --git a/src/src/tlscert-openssl.c b/src/src/tlscert-openssl.c
index 938b0ab..46de499 100644
--- a/src/src/tlscert-openssl.c
+++ b/src/src/tlscert-openssl.c
@@ -477,7 +477,7 @@ if (!i2d_X509_bio(bp, (X509 *)cert))
else
{
long len = BIO_get_mem_data(bp, &cp);
- cp = b64encode(cp, (int)len);
+ cp = b64encode(CUS cp, (int)len);
}
BIO_free(bp);
