Skip to content

Commit 7b3d151

Browse files
committed
TLS review markups
Signed-off-by: Richard Whitehouse <richard.whitehouse@metaswitch.com>
1 parent 148917b commit 7b3d151

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

CHANGELOG.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1313
- Allow HTTPS connectors to be built which don't pin the server CA certificate
1414
- Allow HTTPS to work on Mac/Windows/iOS
1515
- Enforce that HTTPS is used if we are using a HTTPS connector.
16-
- Return Results, rather than unwrapping errors on client creation
16+
- Return Results, rather than unwrapping errors on connector creation
1717
- openssl 0.10
1818

1919
### Removed
20-
- Remove HTTPS methods for Mac OS X, iOS and Windows
2120

2221
## [3.2.0] - 2020-02-12
2322
### Added

src/connector.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ impl HttpsBuilder {
7171
///
7272
/// * `ca_certificate` - Path to CA certificate used to authenticate the server
7373
#[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
74-
pub fn pin_server<CA>(mut self, ca_certificate: CA) -> Self
74+
pub fn pin_server_certificate<CA>(mut self, ca_certificate: CA) -> Self
7575
where
7676
CA: AsRef<Path>,
7777
{
@@ -86,7 +86,7 @@ impl HttpsBuilder {
8686
/// * `client_key` - Path to the client private key
8787
/// * `client_certificate` - Path to the client's public certificate associated with the private key
8888
#[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
89-
pub fn client<K, C>(mut self, client_key: K, client_certificate: C) -> Self
89+
pub fn client_authentication<K, C>(mut self, client_key: K, client_certificate: C) -> Self
9090
where
9191
K: AsRef<Path>,
9292
C: AsRef<Path>,
@@ -130,7 +130,7 @@ impl HttpsBuilder {
130130
}
131131

132132
#[cfg(any(target_os = "macos", target_os = "windows", target_os = "ios"))]
133-
/// Build the HTTPS connector. Will if the SSL connector can't be created.
133+
/// Build the HTTPS connector. Will fail if the SSL connector can't be created.
134134
pub fn build(
135135
self,
136136
) -> Result<hyper_tls::HttpsConnector<hyper::client::HttpConnector>, native_tls::Error> {

0 commit comments

Comments
 (0)