aboutsummaryrefslogtreecommitdiff
path: root/openssl/Cargo.toml
diff options
context:
space:
mode:
authorAlex Crichton <[email protected]>2016-09-30 00:43:05 -0700
committerAlex Crichton <[email protected]>2016-10-12 22:49:55 -0700
commit43c951f743e68fac5f45119eda7c994882a1d489 (patch)
tree45169f1b92858a3ba2ad0287de1bf1ecb395804b /openssl/Cargo.toml
parentRename NoPadding to None (diff)
downloadrust-openssl-43c951f743e68fac5f45119eda7c994882a1d489.tar.xz
rust-openssl-43c951f743e68fac5f45119eda7c994882a1d489.zip
Add support for OpenSSL 1.1.0
This commit is relatively major refactoring of the `openssl-sys` crate as well as the `openssl` crate itself. The end goal here was to support OpenSSL 1.1.0, and lots of other various tweaks happened along the way. The major new features are: * OpenSSL 1.1.0 is supported * OpenSSL 0.9.8 is no longer supported (aka all OSX users by default) * All FFI bindings are verified with the `ctest` crate (same way as the `libc` crate) * CI matrixes are vastly expanded to include 32/64 of all platforms, more OpenSSL version coverage, as well as ARM coverage on Linux * The `c_helpers` module is completely removed along with the `gcc` dependency. * The `openssl-sys` build script was completely rewritten * Now uses `OPENSSL_DIR` to find the installation, not include/lib env vars. * Better error messages for mismatched versions. * Better error messages for failing to find OpenSSL on a platform (more can be done here) * Probing of OpenSSL build-time configuration to inform the API of the `*-sys` crate. * Many Cargo features have been removed as they're now enabled by default. As this is a breaking change to both the `openssl` and `openssl-sys` crates this will necessitate a major version bump of both. There's still a few more API questions remaining but let's hash that out on a PR! Closes #452
Diffstat (limited to 'openssl/Cargo.toml')
-rw-r--r--openssl/Cargo.toml43
1 files changed, 18 insertions, 25 deletions
diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml
index 3fd46c4b..d9691403 100644
--- a/openssl/Cargo.toml
+++ b/openssl/Cargo.toml
@@ -12,28 +12,23 @@ build = "build.rs"
exclude = ["test/*"]
[features]
-tlsv1_2 = ["openssl-sys/tlsv1_2"]
-tlsv1_1 = ["openssl-sys/tlsv1_1"]
-dtlsv1 = ["openssl-sys/dtlsv1"]
-dtlsv1_2 = ["openssl-sys/dtlsv1_2"]
-sslv2 = ["openssl-sys/sslv2"]
-sslv3 = ["openssl-sys/sslv3"]
-aes_xts = ["openssl-sys/aes_xts"]
-aes_ctr = ["openssl-sys/aes_ctr"]
-npn = ["openssl-sys/npn"]
-alpn = ["openssl-sys/alpn"]
-rfc5114 = ["openssl-sys/rfc5114"]
-ecdh_auto = ["openssl-sys/ecdh_auto"]
-pkcs5_pbkdf2_hmac = ["openssl-sys/pkcs5_pbkdf2_hmac"]
-hmac_clone = ["openssl-sys/hmac_clone"]
+aes_xts = []
+aes_ctr = []
-c_helpers = ["gcc"]
-x509_clone = ["c_helpers"]
-x509_generator_request = ["c_helpers"]
-x509_expiry = ["c_helpers"]
-ssl_context_clone = ["c_helpers"]
-hmac = ["c_helpers"]
-dh_from_params = ["c_helpers"]
+# Added in OpenSSL 1.0.2
+rfc5114 = []
+
+# TODO: what to do about these features?
+# tlsv1_2 = []
+# tlsv1_1 = []
+# dtlsv1 = []
+# dtlsv1_2 = []
+# sslv2 = []
+# sslv3 = []
+
+npn = []
+alpn = []
+ecdh_auto = []
[dependencies]
bitflags = "0.7"
@@ -41,11 +36,9 @@ lazy_static = "0.2"
libc = "0.2"
openssl-sys = { version = "0.7.17", path = "../openssl-sys" }
-[build-dependencies]
-gcc = { version = "0.3", optional = true }
-
[dev-dependencies]
-rustc-serialize = "0.3"
net2 = "0.2.16"
+rustc-serialize = "0.3"
+tempdir = "0.3"
winapi = "0.2"
ws2_32-sys = "0.2"