aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-05-02 20:10:12 -0700
committerSteven Fackler <[email protected]>2016-05-03 20:24:07 -0700
commit085b2e6f035b74a51bd648b36fb8be98fa3e5405 (patch)
treebc70bb8b15325437d0d0f4e2fcb2165aaf49cc68 /openssl/src/ssl
parentClean up SNI APIs (diff)
downloadrust-openssl-085b2e6f035b74a51bd648b36fb8be98fa3e5405.tar.xz
rust-openssl-085b2e6f035b74a51bd648b36fb8be98fa3e5405.zip
Drop is_dtls methods on SslMethod
Diffstat (limited to 'openssl/src/ssl')
-rw-r--r--openssl/src/ssl/mod.rs32
1 files changed, 6 insertions, 26 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 0b7d8b27..f9ba99ca 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -169,30 +169,6 @@ impl SslMethod {
_ => None,
}
}
-
- #[cfg(feature = "dtlsv1")]
- pub fn is_dtlsv1(&self) -> bool {
- *self == SslMethod::Dtlsv1
- }
-
- #[cfg(feature = "dtlsv1_2")]
- pub fn is_dtlsv1_2(&self) -> bool {
- *self == SslMethod::Dtlsv1_2
- }
-
- pub fn is_dtls(&self) -> bool {
- self.is_dtlsv1() || self.is_dtlsv1_2()
- }
-
- #[cfg(not(feature = "dtlsv1"))]
- pub fn is_dtlsv1(&self) -> bool {
- false
- }
-
- #[cfg(not(feature = "dtlsv1_2"))]
- pub fn is_dtlsv1_2(&self) -> bool {
- false
- }
}
/// Determines the type of certificate verification used
@@ -496,8 +472,12 @@ impl SslContext {
let ctx = SslContext { ctx: ctx };
- if method.is_dtls() {
- ctx.set_read_ahead(1);
+ match method {
+ #[cfg(feature = "dtlsv1")]
+ SslMethod::Dtlsv1 => ctx.set_read_ahead(1),
+ #[cfg(feature = "dtlsv1_2")]
+ SslMethod::Dtlsv1_2 => ctx.set_read_ahead(1),
+ _ => {}
}
Ok(ctx)