From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 26 Apr 2016 10:29:51 +0000 (+0200)
Subject: More lint misery
X-Git-Tag: release-1.7.0-rc1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d4d5b181ebcee999c6f3c70eb689d0cbac9f48b;p=thirdparty%2Fldns.git

More lint misery
---

diff --git a/dnssec_sign.c b/dnssec_sign.c
index 87c033e7..940a7de1 100644
--- a/dnssec_sign.c
+++ b/dnssec_sign.c
@@ -483,12 +483,14 @@ ldns_sign_public_evp(ldns_buffer *to_sign,
 	/* OpenSSL output is different, convert it */
 	r = 0;
 #ifdef USE_DSA
+#ifndef S_SPLINT_S
 	/* unfortunately, OpenSSL output is different from DNS DSA format */
 	if (EVP_PKEY_type(key->type) == EVP_PKEY_DSA) {
 		r = 1;
 		sigdata_rdf = ldns_convert_dsa_rrsig_asn12rdf(b64sig, siglen);
 	}
 #endif
+#endif
 #if defined(USE_ECDSA) || defined(USE_ED25519) || defined(USE_ED448)
 	if(
 #  ifdef HAVE_EVP_PKEY_BASE_ID
@@ -501,7 +503,7 @@ ldns_sign_public_evp(ldns_buffer *to_sign,
                 if(ldns_pkey_is_ecdsa(key)) {
 			r = 1;
 			sigdata_rdf = ldns_convert_ecdsa_rrsig_asn1len2rdf(
-				b64sig, siglen, ldns_pkey_is_ecdsa(key));
+				b64sig, (long)siglen, ldns_pkey_is_ecdsa(key));
 		}
 #  endif /* USE_ECDSA */
 #  ifdef USE_ED25519
@@ -1090,7 +1092,11 @@ ldns_dnssec_zone_create_rrsigs(ldns_dnssec_zone *zone,
 static void
 ldns_key_list_filter_for_dnskey(ldns_key_list *key_list, int flags)
 {
-	bool algos[256] = { false };
+	bool algos[256]
+#ifndef S_SPLINT_S
+	                = { false }
+#endif
+	                           ;
 	ldns_signing_algorithm saw_ksk = 0;
 	ldns_key *key;
 	size_t i;
@@ -1128,7 +1134,11 @@ ldns_key_list_filter_for_dnskey(ldns_key_list *key_list, int flags)
 static void
 ldns_key_list_filter_for_non_dnskey(ldns_key_list *key_list, int flags)
 {
-	bool algos[256] = { false };
+	bool algos[256]
+#ifndef S_SPLINT_S
+	                = { false }
+#endif
+	                           ;
 	ldns_signing_algorithm saw_zsk = 0;
 	ldns_key *key;
 	size_t i;
diff --git a/keys.c b/keys.c
index 7ec01ad2..e5237875 100644
--- a/keys.c
+++ b/keys.c
@@ -1088,11 +1088,13 @@ ldns_key_new_frm_algorithm(ldns_signing_algorithm alg, uint16_t size)
 				EVP_PKEY_CTX_free(ctx);
 				return NULL;
 			}
+#ifndef S_SPLINT_S
 			if (EVP_PKEY_keygen(ctx, &k->_key.key) <= 0) {
 				ldns_key_free(k);
 				EVP_PKEY_CTX_free(ctx);
 				return NULL;
 			}
+#endif
 			EVP_PKEY_CTX_free(ctx);
 #else /* HAVE_EVP_PKEY_KEYGEN */
 			r = RSA_generate_key((int)size, RSA_F4, NULL, NULL);