aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAntonio Quartulli2018-11-01 00:01:24 +0800
committerGert Doering2018-10-31 17:52:46 +0100
commitddd925bf23bc1b43fda93d2757619a1613cec1ba (patch)
tree46136d874a4b2c5361ddd2c581f2f5ea9f2594f0 /src
parent658a8ee453a236e48ecc4bf19a81d8d7717955ff (diff)
downloadopenvpn-ddd925bf23bc1b43fda93d2757619a1613cec1ba.zip
openvpn-ddd925bf23bc1b43fda93d2757619a1613cec1ba.tar.gz
tls-crypt: properly cast time_t to uint64_t
The exact type of time_t is platform dependent and therefore can't be assumed to be uint64_t all the time. For example, on 32bit platforms, where time_t is defined as long (32bit), the compiler will generate the following warning, due to the arithmetic used in the macro: tls_crypt.c:745:29: warning: shift count >= width of type [-Wshift-count-overflow] Force time_t to be parsed as uint64_t. Reported-by: Arne Schwabe <arne@rfc2549.org> Signed-off-by: Antonio Quartulli <a@unstable.cc> Acked-by: Arne Schwabe <arne@rfc2549.org> Message-Id: <20181031160124.26972-1-a@unstable.cc> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg17868.html Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src')
-rw-r--r--src/openvpn/tls_crypt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/openvpn/tls_crypt.c b/src/openvpn/tls_crypt.c
index d70d0a6..c3ed2b9 100644
--- a/src/openvpn/tls_crypt.c
+++ b/src/openvpn/tls_crypt.c
@@ -742,7 +742,7 @@ tls_crypt_v2_write_client_key_file(const char *filename,
}
else
{
- int64_t timestamp = htonll(now);
+ int64_t timestamp = htonll((uint64_t)now);
ASSERT(buf_write(&metadata, &TLS_CRYPT_METADATA_TYPE_TIMESTAMP, 1));
ASSERT(buf_write(&metadata, &timestamp, sizeof(timestamp)));
}