[v4_2] Fixes compilation error in dst_api.c

    Merges in rt37708.

diff --git a/RELNOTES b/RELNOTES
index 726d7ef7600076f3a1a60d1c04ed42c9e2514c61..9b3b79d484fef937a1dd8d11d114556db5f3e91d 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -64,8 +64,10 @@ by Eric Young (eay@cryptsoft.com).
   [ISC-Bugs #36897]
 
 - Addressed Coverity issues reported as of 07-31-2014:
-  [ISC-Bugs #36712] Corrects Coverity reported "high" impact issues
+  [ISC-Bugs #36712] Corrects Coverity reported "high" impact issues.
   [ISC-Bugs #36933] Corrects Coverity reported "medium" impact issues
+  [ISC-Bugs #37708] Fixes compilation error in dst_api.c seen in older
+  compilers that was introduced by #36712
 
 - Server now supports a failover split value of 256.
   [ISC-Bugs] #36664]

diff --git a/dst/dst_api.c b/dst/dst_api.c
index 30dc66f5e678a436911701103c87c262110a1d28..a77abd2d797fce280797d58f3e29775f37f9e3a4 100644 (file)
--- a/dst/dst_api.c
+++ b/dst/dst_api.c
@@ -66,7 +66,7 @@ const char *dst_path = "";
 /* internal I/O functions */
 static DST_KEY *dst_s_read_public_key(const char *in_name, 
                                      const unsigned in_id, int in_alg);
-static int dst_s_read_private_key_file(char *name, DST_KEY *pk_key,
+static int dst_s_read_private_key_file(const char *name, DST_KEY *pk_key,
                                       unsigned in_id, int in_alg);
 static int dst_s_write_public_key(const DST_KEY *key);
 static int dst_s_write_private_key(const DST_KEY *key);
@@ -365,7 +365,7 @@ dst_read_key(const char *in_keyname, const unsigned in_id,
                                            0)))
                return (dg_key);
        /* Fill in private key and some fields in the general key structure */
-       if (dst_s_read_private_key_file((char *)(in_keyname), dg_key, pubkey->dk_id,
+       if (dst_s_read_private_key_file(in_keyname, dg_key, pubkey->dk_id,
                                        pubkey->dk_alg) == 0)
                dg_key = dst_free_key(dg_key);
 
@@ -843,7 +843,7 @@ dst_key_to_buffer(DST_KEY *key, u_char *out_buff, unsigned buf_len)
  */
 
 static int
-dst_s_read_private_key_file(char *name, DST_KEY *pk_key, unsigned in_id,
+dst_s_read_private_key_file(const char *name, DST_KEY *pk_key, unsigned in_id,
                            int in_alg)
 {
        int cnt, alg, len, major, minor, file_major, file_minor;