Merge branch 'release-v0.9.0' into releasev0.9.0

1 files changed, 7 insertions, 29 deletions

diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml
index 3fd46c4b..1417bea7 100644
--- a/openssl/Cargo.toml
+++ b/openssl/Cargo.toml
@@ -1,51 +1,29 @@
 [package]
 name = "openssl"
-version = "0.8.3"
+version = "0.9.0"
 authors = ["Steven Fackler <[email protected]>"]
 license = "Apache-2.0"
 description = "OpenSSL bindings"
 repository = "https://github.com/sfackler/rust-openssl"
-documentation = "https://sfackler.github.io/rust-openssl/doc/v0.8.3/openssl"
+documentation = "https://sfackler.github.io/rust-openssl/doc/v0.9.0/openssl"
 readme = "../README.md"
 keywords = ["crypto", "tls", "ssl", "dtls"]
 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"]
+v101 = []
+v102 = []
+v110 = []
 
 [dependencies]
 bitflags = "0.7"
 lazy_static = "0.2"
 libc = "0.2"
-openssl-sys = { version = "0.7.17", path = "../openssl-sys" }
-
-[build-dependencies]
-gcc = { version = "0.3", optional = true }
+openssl-sys = { version = "0.9", path = "../openssl-sys" }
 
 [dev-dependencies]
 rustc-serialize = "0.3"
-net2 = "0.2.16"
+tempdir = "0.3"
 winapi = "0.2"
 ws2_32-sys = "0.2"