diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-10 10:41:03 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-10 10:41:03 -0500 |
| commit | b443d6a4fbfaac8d4a944d8b2a763666d1683ada (patch) | |
| tree | 4c0db59242bb3d19ceefc13927f9325cb5c4809b /src/common/aes.c | |
| parent | 6b9298ef72997c1cd0ed2e9c47abeb6c06f64f9f (diff) | |
| parent | 5741aef3dc0dc245ab930c21b277a5a829c9970d (diff) | |
| download | tor-b443d6a4fbfaac8d4a944d8b2a763666d1683ada.tar tor-b443d6a4fbfaac8d4a944d8b2a763666d1683ada.tar.gz | |
Merge branch 'openssl_versions_squashed'
Diffstat (limited to 'src/common/aes.c')
| -rw-r--r-- | src/common/aes.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/aes.c b/src/common/aes.c index 9487cdd51..5791e6676 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -17,7 +17,8 @@ #include <openssl/aes.h> #include <openssl/evp.h> #include <openssl/engine.h> -#if OPENSSL_VERSION_NUMBER >= 0x1000001fL +#include "crypto.h" +#if OPENSSL_VERSION_NUMBER >= OPENSSL_V(1,0,0,'a') /* See comments about which counter mode implementation to use below. */ #include <openssl/modes.h> #define USE_OPENSSL_CTR |