diff options
| author | Steven Fackler <[email protected]> | 2016-10-14 11:39:43 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-10-14 11:39:43 -0700 |
| commit | 98e71596fb48ce7cdabd46e581f32a9a54398cce (patch) | |
| tree | 7d600055248d58edfccd4ed5577c32c86bac3ff2 /openssl/Cargo.toml | |
| parent | Rename NoPadding to None (diff) | |
| parent | Ignore DTLS tests on Windows/ARM for now (diff) | |
| download | rust-openssl-98e71596fb48ce7cdabd46e581f32a9a54398cce.tar.xz rust-openssl-98e71596fb48ce7cdabd46e581f32a9a54398cce.zip | |
Merge pull request #464 from alexcrichton/systest
Add support for OpenSSL 1.1.0
Diffstat (limited to 'openssl/Cargo.toml')
| -rw-r--r-- | openssl/Cargo.toml | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml index 3fd46c4b..3845c51d 100644 --- a/openssl/Cargo.toml +++ b/openssl/Cargo.toml @@ -12,28 +12,8 @@ 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"] - -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"] +openssl-102 = [] +openssl-110 = ["openssl-102"] [dependencies] bitflags = "0.7" @@ -41,11 +21,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" |