Message ID | 20181031160124.26972-1-a@unstable.cc |
---|---|
State | Accepted |
Headers | show |
Series | [Openvpn-devel] tls-crypt: properly cast time_t to uint64_t | expand |
Am 31.10.18 um 17:01 schrieb Antonio Quartulli: > 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. > > ACK. Fixes the warning on my Android build and looks correct. Arne
Your patch has been applied to the master branch. commit ddd925bf23bc1b43fda93d2757619a1613cec1ba Author: Antonio Quartulli Date: Thu Nov 1 00:01:24 2018 +0800 tls-crypt: properly cast time_t to uint64_t 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> -- kind regards, Gert Doering
diff --git a/src/openvpn/tls_crypt.c b/src/openvpn/tls_crypt.c index d70d0a66..c3ed2b93 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, ×tamp, sizeof(timestamp))); }
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> --- src/openvpn/tls_crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)