min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Abstract over AsRef<Path>

This commit is contained in:
Steven Fackler 2015-05-02 13:59:11 -07:00
parent d044d87c1b
commit 00c17035ec
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openssl/src/ssl/mod.rs
View File

@ -431,8 +431,8 @@ impl SslContext {
#[allow(non_snake_case)] #[allow(non_snake_case)]
/// Specifies the file that contains trusted CA certificates. /// Specifies the file that contains trusted CA certificates.
pub fn set_CA_file(&mut self, file: &Path) -> Result<(),SslError> { pub fn set_CA_file<P: AsRef<Path>>(&mut self, file: P) -> Result<(),SslError> {
let file = CString::new(file.as_os_str().to_str().expect("invalid utf8")).unwrap(); let file = CString::new(file.as_ref().as_os_str().to_str().expect("invalid utf8")).unwrap();
wrap_ssl_result( wrap_ssl_result(
unsafe { unsafe {
ffi::SSL_CTX_load_verify_locations(self.ctx, file.as_ptr(), ptr::null()) ffi::SSL_CTX_load_verify_locations(self.ctx, file.as_ptr(), ptr::null())
@ -440,9 +440,9 @@ impl SslContext {
} }
/// Specifies the file that contains certificate /// Specifies the file that contains certificate
pub fn set_certificate_file(&mut self, file: &Path, pub fn set_certificate_file<P: AsRef<Path>>(&mut self, file: P, file_type: X509FileType)
file_type: X509FileType) -> Result<(),SslError> { -> Result<(),SslError> {
let file = CString::new(file.as_os_str().to_str().expect("invalid utf8")).unwrap(); let file = CString::new(file.as_ref().as_os_str().to_str().expect("invalid utf8")).unwrap();
wrap_ssl_result( wrap_ssl_result(
unsafe { unsafe {
ffi::SSL_CTX_use_certificate_file(self.ctx, file.as_ptr(), file_type as c_int) ffi::SSL_CTX_use_certificate_file(self.ctx, file.as_ptr(), file_type as c_int)
@ -467,9 +467,9 @@ impl SslContext {
} }
/// Specifies the file that contains private key /// Specifies the file that contains private key
pub fn set_private_key_file(&mut self, file: &Path, pub fn set_private_key_file<P: AsRef<Path>>(&mut self, file: P,
file_type: X509FileType) -> Result<(),SslError> { file_type: X509FileType) -> Result<(),SslError> {
let file = CString::new(file.as_os_str().to_str().expect("invalid utf8")).unwrap(); let file = CString::new(file.as_ref().as_os_str().to_str().expect("invalid utf8")).unwrap();
wrap_ssl_result( wrap_ssl_result(
unsafe { unsafe {
ffi::SSL_CTX_use_PrivateKey_file(self.ctx, file.as_ptr(), file_type as c_int) ffi::SSL_CTX_use_PrivateKey_file(self.ctx, file.as_ptr(), file_type as c_int)