lint

diff --git a/Changelog b/Changelog
index c60be2e694b53fb9200f99557f84fc113d06fddc..3e13deadc0114b31fb012477e3250a9abb696f9a 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -75,8 +75,9 @@ TBD
        * Fix for openssl 1.1.0 API changes.
        * Remove commented out macro.  Thanks Thiago Farina
        * bugfix #641: Include install-sh in .gitignore
-       * bugfix #796: Fix -Wshadow issues
-         Thanks Ngie Cooper
+       * bugfix #825: Module import breaks with newer SWIG versions.
+         Thanks Christoph Egger
+       * bugfix #796: Fix -Wshadow issues.  Thanks Ngie Cooper
 
 1.6.17 2014-01-10
        * Fix ldns_dnssec_zone_new_frm_fp_l to allow the last parsed line of a

diff --git a/examples/ldns-keygen.c b/examples/ldns-keygen.c
index 3b200d0321dc1a77d671bf5ede5c57ba3d1b594c..4ec8244dad71239affe52fc428631abb243f9cfb 100644 (file)
--- a/examples/ldns-keygen.c
+++ b/examples/ldns-keygen.c
@@ -191,7 +191,7 @@ main(int argc, char *argv[])
        key = ldns_key_new_frm_algorithm(algorithm, bits);
        if(!key) {
                fprintf(stderr, "cannot generate key of algorithm %s\n",
-                       ldns_pkt_algorithm2str(algorithm));
+                       ldns_pkt_algorithm2str((ldns_algorithm)algorithm));
                exit(EXIT_FAILURE);
        }
 

diff --git a/host2str.c b/host2str.c
index 604b1cbf30768640c8169dbfc2201c02cb78fda4..121558c11bba431ba132e2c02a99bb2a20a7bb00 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -1944,7 +1944,7 @@ ldns_print_bignum_b64_line(ldns_buffer* output, const char* label, const BIGNUM*
                        LDNS_FREE(bignumbuf);
                        return 0;
                }
-               b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, i, bignumbuf);
+               b64_bignum =  ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, (size_t)i, bignumbuf);
                if (ldns_rdf2buffer_str(output, b64_bignum) != LDNS_STATUS_OK) {
                        ldns_rdf_deep_free(b64_bignum);
                        LDNS_FREE(bignumbuf);

diff --git a/keys.c b/keys.c
index 340d8d27e801a4bba4f4c7366e9d1341668ab8a4..6a23cb5ddf6cc437a3fe65c0091ba80c7323d3f7 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -877,6 +877,7 @@ ldns_key_new_frm_fp_rsa_l(FILE *f, int *line_nr)
 #endif /* splint */
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000
+# ifndef S_SPLINT_S
        rsa->n = n;
        rsa->e = e;
        rsa->d = d;
@@ -885,6 +886,7 @@ ldns_key_new_frm_fp_rsa_l(FILE *f, int *line_nr)
        rsa->dmp1 = dmp1;
        rsa->dmq1 = dmq1;
        rsa->iqmp = iqmp;
+# endif
 #else
        if(!RSA_set0_key(rsa, n, e, d))
                goto error;
@@ -995,11 +997,13 @@ ldns_key_new_frm_fp_dsa_l(FILE *f, ATTR_UNUSED(int *line_nr))
 #endif /* splint */
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000
+# ifndef S_SPLINT_S
        dsa->p = p;
        dsa->q = q;
        dsa->g = g;
        dsa->priv_key = priv_key;
        dsa->pub_key = pub_key;
+# endif
 #else
        if(!DSA_set0_pqg(dsa, p, q, g))
                goto error;