aboutsummaryrefslogtreecommitdiff
path: root/src/common/aes.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-01-05 15:05:17 -0500
committerNick Mathewson <nickm@torproject.org>2012-01-10 10:40:30 -0500
commit85c7d7659ea1b9c99c13596e943260ad2e396483 (patch)
tree5a3700122078de625883b9b2a34f6696533724ae /src/common/aes.c
parent6b9298ef72997c1cd0ed2e9c47abeb6c06f64f9f (diff)
downloadtor-85c7d7659ea1b9c99c13596e943260ad2e396483.tar.gz
tor-85c7d7659ea1b9c99c13596e943260ad2e396483.zip
Add macros to construct openssl version numbers
It's a pain to convert 0x0090813f to and from 0.9.8s-release on the fly, so these macros should help.
Diffstat (limited to 'src/common/aes.c')
-rw-r--r--src/common/aes.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/aes.c b/src/common/aes.c
index 9487cdd51c..5791e66765 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