commit 4c69ba5895dd448001f80645d62b0d4497b61ac5 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 22 08:52:42 2016 -0400

Fix conflicting types errors for aes.c. --- src/common/aes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/aes.c b/src/common/aes.c index cb8fb68..ef94d8a 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -259,9 +259,9 @@ evaluate_ctr_for_aes(void) #define COUNTER(c, n) ((c)->counter ## n) #endif

-static void aes_set_key(aes_cnt_cipher_t *cipher, const char *key, +static void aes_set_key(aes_cnt_cipher_t *cipher, const uint8_t *key, int key_bits); -static void aes_set_iv(aes_cnt_cipher_t *cipher, const char *iv); +static void aes_set_iv(aes_cnt_cipher_t *cipher, const uint8_t *iv);

/** * Return a newly allocated counter-mode AES128 cipher implementation,