diff options
| author | Steven Fackler <[email protected]> | 2014-10-07 23:27:55 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2014-10-07 23:27:55 -0700 |
| commit | fe000066a439f09283b2a4c847f67533faad3ed8 (patch) | |
| tree | 27869a1d117933f2ed1e866179b08851561d008f /src/ssl | |
| parent | Merge pull request #72 from sfackler/revert-66-fix-failing-test (diff) | |
| parent | Minor doc fixes and feature mentions (diff) | |
| download | rust-openssl-fe000066a439f09283b2a4c847f67533faad3ed8.tar.xz rust-openssl-fe000066a439f09283b2a4c847f67533faad3ed8.zip | |
Merge pull request #73 from vhbit/minor-doc-fixes
Minor doc fixes and feature mentions
Diffstat (limited to 'src/ssl')
| -rw-r--r-- | src/ssl/mod.rs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/ssl/mod.rs b/src/ssl/mod.rs index b37d3142..31307a03 100644 --- a/src/ssl/mod.rs +++ b/src/ssl/mod.rs @@ -45,17 +45,19 @@ fn init() { #[allow(non_camel_case_types)] pub enum SslMethod { #[cfg(feature = "sslv2")] - /// Only support the SSLv2 protocol + /// Only support the SSLv2 protocol, requires `feature="sslv2"` Sslv2, + /// Support the SSLv2, SSLv3 and TLSv1 protocols + Sslv23, /// Only support the SSLv3 protocol Sslv3, /// Only support the TLSv1 protocol Tlsv1, - /// Support the SSLv2, SSLv3 and TLSv1 protocols - Sslv23, #[cfg(feature = "tlsv1_1")] + /// Support TLSv1.1 protocol, requires `feature="tlsv1_1"` Tlsv1_1, #[cfg(feature = "tlsv1_2")] + /// Support TLSv1.2 protocol, requires `feature="tlsv1_2"` Tlsv1_2, } @@ -256,7 +258,7 @@ impl SslContext { })) } - /// Specifies the file that is client certificate + /// Specifies the file that contains certificate pub fn set_certificate_file(&mut self, file: &Path, file_type: X509FileType) -> Option<SslError> { wrap_ssl_result(file.with_c_str(|file| { @@ -266,7 +268,7 @@ impl SslContext { })) } - /// Specifies the file that is client private key + /// Specifies the file that contains private key pub fn set_private_key_file(&mut self, file: &Path, file_type: X509FileType) -> Option<SslError> { wrap_ssl_result(file.with_c_str(|file| { |