diff options
| author | Valerii Hiora <[email protected]> | 2014-10-07 14:54:35 +0300 |
|---|---|---|
| committer | Valerii Hiora <[email protected]> | 2014-10-07 14:54:35 +0300 |
| commit | 41287f3b146c3b5b5c2a706eac7d436dac060864 (patch) | |
| tree | 76c77f5ab3fa71deef73d8f4425b3409d44d7a5b /src | |
| parent | Merge pull request #60 from vhbit/cert-gen-cleanup (diff) | |
| download | rust-openssl-41287f3b146c3b5b5c2a706eac7d436dac060864.tar.xz rust-openssl-41287f3b146c3b5b5c2a706eac7d436dac060864.zip | |
Using `Path`s instead of plain strings
Refs #45
Diffstat (limited to 'src')
| -rw-r--r-- | src/ssl/mod.rs | 6 | ||||
| -rw-r--r-- | src/ssl/tests.rs | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/ssl/mod.rs b/src/ssl/mod.rs index c7c024ed..b37d3142 100644 --- a/src/ssl/mod.rs +++ b/src/ssl/mod.rs @@ -248,7 +248,7 @@ impl SslContext { #[allow(non_snake_case)] /// Specifies the file that contains trusted CA certificates. - pub fn set_CA_file(&mut self, file: &str) -> Option<SslError> { + pub fn set_CA_file(&mut self, file: &Path) -> Option<SslError> { wrap_ssl_result(file.with_c_str(|file| { unsafe { ffi::SSL_CTX_load_verify_locations(self.ctx, file, ptr::null()) @@ -257,7 +257,7 @@ impl SslContext { } /// Specifies the file that is client certificate - pub fn set_certificate_file(&mut self, file: &str, + pub fn set_certificate_file(&mut self, file: &Path, file_type: X509FileType) -> Option<SslError> { wrap_ssl_result(file.with_c_str(|file| { unsafe { @@ -267,7 +267,7 @@ impl SslContext { } /// Specifies the file that is client private key - pub fn set_private_key_file(&mut self, file: &str, + pub fn set_private_key_file(&mut self, file: &Path, file_type: X509FileType) -> Option<SslError> { wrap_ssl_result(file.with_c_str(|file| { unsafe { diff --git a/src/ssl/tests.rs b/src/ssl/tests.rs index 0e6edbf7..fc609bf3 100644 --- a/src/ssl/tests.rs +++ b/src/ssl/tests.rs @@ -34,7 +34,7 @@ fn test_verify_trusted() { let stream = TcpStream::connect("127.0.0.1", 15418).unwrap(); let mut ctx = SslContext::new(Sslv23).unwrap(); ctx.set_verify(SslVerifyPeer, None); - match ctx.set_CA_file("test/cert.pem") { + match ctx.set_CA_file(&Path::new("test/cert.pem")) { None => {} Some(err) => fail!("Unexpected error {}", err) } @@ -77,7 +77,7 @@ fn test_verify_trusted_callback_override_ok() { let stream = TcpStream::connect("127.0.0.1", 15418).unwrap(); let mut ctx = SslContext::new(Sslv23).unwrap(); ctx.set_verify(SslVerifyPeer, Some(callback)); - match ctx.set_CA_file("test/cert.pem") { + match ctx.set_CA_file(&Path::new("test/cert.pem")) { None => {} Some(err) => fail!("Unexpected error {}", err) } @@ -95,7 +95,7 @@ fn test_verify_trusted_callback_override_bad() { let stream = TcpStream::connect("127.0.0.1", 15418).unwrap(); let mut ctx = SslContext::new(Sslv23).unwrap(); ctx.set_verify(SslVerifyPeer, Some(callback)); - match ctx.set_CA_file("test/cert.pem") { + match ctx.set_CA_file(&Path::new("test/cert.pem")) { None => {} Some(err) => fail!("Unexpected error {}", err) } @@ -123,7 +123,7 @@ fn test_verify_trusted_get_error_ok() { let stream = TcpStream::connect("127.0.0.1", 15418).unwrap(); let mut ctx = SslContext::new(Sslv23).unwrap(); ctx.set_verify(SslVerifyPeer, Some(callback)); - match ctx.set_CA_file("test/cert.pem") { + match ctx.set_CA_file(&Path::new("test/cert.pem")) { None => {} Some(err) => fail!("Unexpected error {}", err) } |