diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-09-22 08:52:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-22 08:52:42 -0400 |
| commit | 4c69ba5895dd448001f80645d62b0d4497b61ac5 (patch) | |
| tree | bf4332c457292bc12f94b8228382fc36bfd72b25 | |
| parent | 20ce9f23dc89847dfc3b70ff1cc9f7ec5bd5d644 (diff) | |
| download | tor-4c69ba5895dd448001f80645d62b0d4497b61ac5.tar.gz tor-4c69ba5895dd448001f80645d62b0d4497b61ac5.zip | |
Fix conflicting types errors for aes.c.
| -rw-r--r-- | src/common/aes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/aes.c b/src/common/aes.c index cb8fb681e4..ef94d8a75c 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, |