From: Juergen Perlinger <perlinger@ntp.org>
Date: Tue, 23 Mar 2010 21:05:52 +0000 (+0100)
Subject: ssl_init.c:
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fe156672ea07fe67e45a1c41b3544058de5770f;p=thirdparty%2Fntp.git

ssl_init.c:
  fixed printf format warnings

bk: 4ba92d30Zk9xMNClV25xzrNsD4sFyg
---

diff --git a/libntp/ssl_init.c b/libntp/ssl_init.c
index c7bf7e63f8..393ce948aa 100644
--- a/libntp/ssl_init.c
+++ b/libntp/ssl_init.c
@@ -93,17 +93,19 @@ keytype_from_text(
 
 	if (NULL != pdigest_len) {
 #ifdef OPENSSL
+		u_int max_digest_len = 0;
+		if (MAX_MAC_LEN > sizeof(keyid_t))
+			max_digest_len = MAX_MAC_LEN - sizeof(keyid_t);
+
 		EVP_DigestInit(&ctx, EVP_get_digestbynid(key_type));
 		EVP_DigestFinal(&ctx, digest, &digest_len);
-		if (digest_len + sizeof(keyid_t) > MAX_MAC_LEN) {
+		if (digest_len > max_digest_len) {
 			fprintf(stderr,
 				"key type %s %u octet digests are too big, max %u\n",
-				keytype_name(key_type), digest_len,
-				MAX_MAC_LEN - sizeof(keyid_t));
+				keytype_name(key_type), digest_len, max_digest_len);
 			msyslog(LOG_ERR,
 				"key type %s %u octet digests are too big, max %u",
-				keytype_name(key_type), digest_len,
-				MAX_MAC_LEN - sizeof(keyid_t));
+				keytype_name(key_type), digest_len, max_digest_len);
 			return 0;
 		}
 #else