aboutsummaryrefslogtreecommitdiff
path: root/openssl
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-10-21 21:22:05 -0700
committerSteven Fackler <[email protected]>2016-10-21 21:22:05 -0700
commitf1c68e354429da9f0ef56972713b110c35850516 (patch)
tree36af76529dd2764cbf7d5f96c36e397de865b53b /openssl
parentFix X509StoreContext (diff)
downloadrust-openssl-f1c68e354429da9f0ef56972713b110c35850516.tar.xz
rust-openssl-f1c68e354429da9f0ef56972713b110c35850516.zip
Rename SslContextOptions
Diffstat (limited to 'openssl')
-rw-r--r--openssl/src/ssl/mod.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 7f990a66..c703d5fc 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -39,7 +39,7 @@ use self::bio::BioMethod;
pub use ssl::error::Error;
bitflags! {
- pub flags SslContextOptions: c_ulong {
+ pub flags SslOptions: c_ulong {
const SSL_OP_MICROSOFT_SESS_ID_BUG = ffi::SSL_OP_MICROSOFT_SESS_ID_BUG,
const SSL_OP_NETSCAPE_CHALLENGE_BUG = ffi::SSL_OP_NETSCAPE_CHALLENGE_BUG,
const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG =
@@ -548,19 +548,19 @@ impl SslContextRef {
}
}
- pub fn set_options(&mut self, option: SslContextOptions) -> SslContextOptions {
+ pub fn set_options(&mut self, option: SslOptions) -> SslOptions {
let ret = unsafe { compat::SSL_CTX_set_options(self.as_ptr(), option.bits()) };
- SslContextOptions::from_bits(ret).unwrap()
+ SslOptions::from_bits(ret).unwrap()
}
- pub fn options(&self) -> SslContextOptions {
+ pub fn options(&self) -> SslOptions {
let ret = unsafe { compat::SSL_CTX_get_options(self.as_ptr()) };
- SslContextOptions::from_bits(ret).unwrap()
+ SslOptions::from_bits(ret).unwrap()
}
- pub fn clear_options(&mut self, option: SslContextOptions) -> SslContextOptions {
+ pub fn clear_options(&mut self, option: SslOptions) -> SslOptions {
let ret = unsafe { compat::SSL_CTX_clear_options(self.as_ptr(), option.bits()) };
- SslContextOptions::from_bits(ret).unwrap()
+ SslOptions::from_bits(ret).unwrap()
}
/// Set the protocols to be used during Next Protocol Negotiation (the protocols