Rename the parameter names "public" and "private" to avoid conflicts with the similarly named C++ keywords. Addresses compile-time errors in C++ code that includes <ell/key.h>. --- ell/key.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ell/key.h b/ell/key.h index 024afc6..f1f95e1 100644 --- a/ell/key.h +++ b/ell/key.h @@ -70,16 +70,16 @@ ssize_t l_key_get_payload_size(struct l_key *key); bool l_key_get_info(struct l_key *key, enum l_key_cipher_type cipher, enum l_checksum_type checksum, size_t *bits, - bool *public); + bool *out_public); struct l_key *l_key_generate_dh_private(const void *prime_buf, size_t prime_len); -bool l_key_compute_dh_public(struct l_key *generator, struct l_key *private, +bool l_key_compute_dh_public(struct l_key *generator, struct l_key *private_key, struct l_key *prime, void *payload, size_t *len); -bool l_key_compute_dh_secret(struct l_key *other_public, struct l_key *private, +bool l_key_compute_dh_secret(struct l_key *other_public, struct l_key *private_key, struct l_key *prime, void *payload, size_t *len); -- 2.17.1