diff options
| author | Steven Fackler <[email protected]> | 2015-10-14 22:25:48 -0400 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-10-14 22:25:48 -0400 |
| commit | 38b0defd91fb8965afda164c09afa72d07359eb0 (patch) | |
| tree | 16283f2a026afd2caf723c94636c12a2eff7f80f /openssl-sys/src/openssl_shim.c | |
| parent | Merge branch 'release-v0.6.6' into release (diff) | |
| parent | Release v0.6.7 (diff) | |
| download | rust-openssl-0.6.7.tar.xz rust-openssl-0.6.7.zip | |
Merge branch 'release-v0.6.7' into releasev0.6.7
Diffstat (limited to 'openssl-sys/src/openssl_shim.c')
| -rw-r--r-- | openssl-sys/src/openssl_shim.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl-sys/src/openssl_shim.c b/openssl-sys/src/openssl_shim.c index f0f55b27..8ebe23ac 100644 --- a/openssl-sys/src/openssl_shim.c +++ b/openssl-sys/src/openssl_shim.c @@ -29,7 +29,7 @@ void rust_openssl_set_id_callback() { #endif -#if OPENSSL_VERSION_NUMBER < 0x1000000L +#if OPENSSL_VERSION_NUMBER < 0x10000000L // Copied from openssl crypto/hmac/hmac.c int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx) { @@ -111,7 +111,7 @@ long SSL_CTX_set_tmp_dh_shim(SSL_CTX *ctx, DH *dh) { return SSL_CTX_set_tmp_dh(ctx, dh); } -#if OPENSSL_VERSION_NUMBER >= 0x1000200L +#if OPENSSL_VERSION_NUMBER >= 0x10002000L int SSL_CTX_set_ecdh_auto_shim(SSL_CTX *ctx, int onoff) { return SSL_CTX_set_ecdh_auto(ctx, onoff); } |