Commit a54bc0da authored by Thomas Markwalder's avatar Thomas Markwalder
Browse files

[v4_1_esv] Fixes compilation error in dst_api.c

    Merges in rt37708.
parent c63e4595
......@@ -73,8 +73,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]
......
......@@ -65,7 +65,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);
......@@ -364,7 +364,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);
......@@ -842,7 +842,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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment