ssl_init.c:

  fixed printf format warnings

bk: 4ba92d30Zk9xMNClV25xzrNsD4sFyg

diff --git a/libntp/ssl_init.c b/libntp/ssl_init.c
index c7bf7e63f8b8b0c282a4aa675304fcc819ae63aa..393ce948aa5c13b891fef479aa89dcbce1b59750 100644 (file)
--- 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