From 8b52995c1d5c5c8031919011ec1d9673234aa404 Mon Sep 17 00:00:00 2001 From: Glenn Strauss Date: Mon, 8 Mar 2021 20:24:16 -0500 Subject: [PATCH] [multiple] use binary '|' to reconstruct ts --- src/mod_auth.c | 2 +- src/mod_secdownload.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mod_auth.c b/src/mod_auth.c index 45ed5565..03d9daa7 100644 --- a/src/mod_auth.c +++ b/src/mod_auth.c @@ -1386,7 +1386,7 @@ static handler_t mod_auth_check_digest(request_st * const r, void *p_d, const st time_t ts = 0; const unsigned char * const nonce_uns = (unsigned char *)nonce; for (i = 0; i < 8 && light_isxdigit(nonce_uns[i]); ++i) { - ts =(time_t)((uint32_t)ts << 4) + hex2int(nonce_uns[i]); + ts =(time_t)((uint32_t)ts << 4) | hex2int(nonce_uns[i]); } const time_t cur_ts = log_epoch_secs; if (nonce[i] != ':' diff --git a/src/mod_secdownload.c b/src/mod_secdownload.c index f7ac2b2e..b8dcc92f 100644 --- a/src/mod_secdownload.c +++ b/src/mod_secdownload.c @@ -444,7 +444,7 @@ URIHANDLER_FUNC(mod_secdownload_uri_handler) { if (*(ts_str + 8) != '/') return HANDLER_GO_ON; for (i = 0; i < 8; i++) { - ts = (time_t)((uint32_t)ts << 4) + hex2int(ts_str[i]); + ts = (time_t)((uint32_t)ts << 4) | hex2int(ts_str[i]); } const time_t cur_ts = log_epoch_secs;