diff options
author | Thomas Markwalder <tmark@isc.org> | 2014-11-05 13:58:21 -0500 |
---|---|---|
committer | Thomas Markwalder <tmark@isc.org> | 2014-11-05 13:58:21 -0500 |
commit | a54bc0dad9cc5fddd338132d366ab95201dbbeed (patch) | |
tree | 7d81b5d31e409c7873453cb243ee5230966a35a2 /dst | |
parent | c63e45951d836a224fb7edd31ca2faded902a04f (diff) | |
download | isc-dhcp-a54bc0dad9cc5fddd338132d366ab95201dbbeed.tar.gz |
[v4_1_esv] Fixes compilation error in dst_api.c
Merges in rt37708.
Diffstat (limited to 'dst')
-rw-r--r-- | dst/dst_api.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dst/dst_api.c b/dst/dst_api.c index 2d9fba2d..73a377b0 100644 --- a/dst/dst_api.c +++ b/dst/dst_api.c @@ -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; |