From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 1 Jul 2018 09:27:48 +0000 (+0200)
Subject: certtool: properly print an int64_t value
X-Git-Tag: gnutls_3_6_3~46^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c19ee607b45830dd142022fff4d42ba7d0ee02e0;p=thirdparty%2Fgnutls.git

certtool: properly print an int64_t value

Also included the gnulib inttype module for portability.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
---

diff --git a/bootstrap.conf b/bootstrap.conf
index b67a531aa7..836f1a6f8a 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -35,7 +35,7 @@ unictype/category-all unictype/property-default-ignorable-code-point unictype/pr
 "
 
 src_modules="
-accept bind close connect getaddrinfo getpass gettext-h inet_ntop inet_pton listen minmax parse-datetime progname read-file recv recvfrom select send sendto servent setsockopt shutdown socket sockets socklen
+accept bind close connect getaddrinfo getpass gettext-h inet_ntop inet_pton listen minmax parse-datetime progname read-file recv recvfrom select send sendto servent setsockopt shutdown socket sockets socklen inttypes
 "
 
 # Build prerequisites
diff --git a/src/certtool-cfg.c b/src/certtool-cfg.c
index 1836fe85a1..f13dabfa82 100644
--- a/src/certtool-cfg.c
+++ b/src/certtool-cfg.c
@@ -31,7 +31,6 @@
 #include <gnutls/x509-ext.h>
 #include <string.h>
 #include <limits.h>
-#include <inttypes.h>
 #include <time.h>
 #include <timespec.h>
 #include <parse-datetime.h>
@@ -57,10 +56,8 @@
 #include "certtool-common.h"
 
 /* to print uint64_t */
-#if SIZEOF_LONG < 8
 # define __STDC_FORMAT_MACROS
 # include <inttypes.h>
-#endif
 
 extern int batch;
 extern int ask_pass;
@@ -751,7 +748,7 @@ int serial_decode(const char *input, gnutls_datum_t *output)
 	}
 
 	if (value <= 0 || value >= value_limit) {
-		fprintf(stderr, "Integer out of range: `%s' (min: 1, max: %lu)\n", input, value_limit-1);
+		fprintf(stderr, "Integer out of range: `%s' (min: 1, max: %"PRId64")\n", input, value_limit-1);
 		return GNUTLS_E_PARSING_ERROR;
 	}