diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-15 11:20:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-15 11:20:48 -0400 |
| commit | 9f83142591dba5460f2cf09e49f716d5c7238f06 (patch) | |
| tree | 558d1d3430532e7eb0b963e6ceba2b9e63d25cfa /src/common/aes.c | |
| parent | 469b847c70c7cb801fa806e3336697866c1453d1 (diff) | |
| parent | 30e2d41a650876793b75bef04a2e18cbf5bc3fd6 (diff) | |
| download | tor-9f83142591dba5460f2cf09e49f716d5c7238f06.tar tor-9f83142591dba5460f2cf09e49f716d5c7238f06.tar.gz | |
Merge remote-tracking branch 'public/bug1031'
Diffstat (limited to 'src/common/aes.c')
| -rw-r--r-- | src/common/aes.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/aes.c b/src/common/aes.c index 2d92d9d44..8e489baae 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -285,7 +285,7 @@ evaluate_ctr_for_aes(void) * value of the current counter. */ static INLINE void -_aes_fill_buf(aes_cnt_cipher_t *cipher) +aes_fill_buf_(aes_cnt_cipher_t *cipher) { /* We don't currently use OpenSSL's counter mode implementation because: * 1) some versions have known bugs @@ -360,7 +360,7 @@ aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits) memset(cipher->buf, 0, sizeof(cipher->buf)); else #endif - _aes_fill_buf(cipher); + aes_fill_buf_(cipher); } /** Release storage held by <b>cipher</b> @@ -453,7 +453,7 @@ aes_crypt(aes_cnt_cipher_t *cipher, const char *input, size_t len, UPDATE_CTR_BUF(cipher, 1); } UPDATE_CTR_BUF(cipher, 0); - _aes_fill_buf(cipher); + aes_fill_buf_(cipher); } } } @@ -492,7 +492,7 @@ aes_crypt_inplace(aes_cnt_cipher_t *cipher, char *data, size_t len) UPDATE_CTR_BUF(cipher, 1); } UPDATE_CTR_BUF(cipher, 0); - _aes_fill_buf(cipher); + aes_fill_buf_(cipher); } } } @@ -514,7 +514,7 @@ aes_set_iv(aes_cnt_cipher_t *cipher, const char *iv) #ifdef CAN_USE_OPENSSL_CTR if (!should_use_openssl_CTR) #endif - _aes_fill_buf(cipher); + aes_fill_buf_(cipher); } #endif |