aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-02-13 21:13:27 -0800
committerSteven Fackler <[email protected]>2015-02-13 21:39:41 -0800
commit15ff737b8c625cb5821f9644bb00ff7f952f7eaa (patch)
tree04285a0ab9f554fe55dbc1740ff1ffdc05d36cf9 /openssl-sys/src
parentOops, pass include dirs through for 1.0.0 versions too (diff)
downloadrust-openssl-15ff737b8c625cb5821f9644bb00ff7f952f7eaa.tar.xz
rust-openssl-15ff737b8c625cb5821f9644bb00ff7f952f7eaa.zip
Ask openssl what version it is
Diffstat (limited to 'openssl-sys/src')
-rw-r--r--openssl-sys/src/old_openssl_shim.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/openssl-sys/src/old_openssl_shim.c b/openssl-sys/src/old_openssl_shim.c
index 473bd2ae..19ce74fc 100644
--- a/openssl-sys/src/old_openssl_shim.c
+++ b/openssl-sys/src/old_openssl_shim.c
@@ -1,6 +1,6 @@
#include <openssl/hmac.h>
-#ifdef OLD_OPENSSL
+#if OPENSSL_VERSION_NUMBER < 0x1000000L
// Copied from openssl crypto/hmac/hmac.c
int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
{
@@ -33,7 +33,7 @@ int HMAC_Final_shim(HMAC_CTX *ctx, unsigned char *md, unsigned int *len) {
return 1;
}
-#else /* OLD_OPENSSL */
+#else
int HMAC_Init_ex_shim(HMAC_CTX *ctx, const void *key, int key_len, const EVP_MD *md, ENGINE *impl) {
return HMAC_Init_ex(ctx, key, key_len, md, impl);
@@ -46,4 +46,4 @@ int HMAC_Update_shim(HMAC_CTX *ctx, const unsigned char *data, int len) {
int HMAC_Final_shim(HMAC_CTX *ctx, unsigned char *md, unsigned int *len) {
return HMAC_Final(ctx, md, len);
}
-#endif /* OLD_OPENSSL */
+#endif