vh/termscp
1
0
Fork 0
mirror of https://github.com/veeso/termscp.git synced 2025-12-07 09:36:00 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rust-ftp finally with tls-native :D

Browse Source
This commit is contained in:
ChristianVisintin
2020-12-03 21:31:51 +01:00
parent a63af295de
commit 3112f999e3
3 changed files with 86 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/filetransfer/ftp_transfer.rs
View File

@@ -33,7 +33,7 @@ use crate::fs::{FsDirectory, FsEntry, FsFile};
use crate::utils::lstime_to_systime;
// Includes
use ftp::openssl::ssl::{SslContext, SslMethod};
use ftp::native_tls::TlsConnector;
use ftp::FtpStream;
use regex::Regex;
use std::io::{Read, Write};
@@ -238,9 +238,14 @@ impl FileTransfer for FtpFileTransfer {
};
// If SSL, open secure session
if self.ftps {
let ctx = SslContext::builder(SslMethod::tls()).unwrap();
let ctx = ctx.build();
stream = match stream.into_secure(ctx) {
let ctx = match TlsConnector::builder().danger_accept_invalid_certs(true).danger_accept_invalid_hostnames(true).build() {
Ok(tls) => tls,
Err(err) => return Err(FileTransferError::new_ex(
FileTransferErrorType::SslError,
format!("{}", err),
))
};
stream = match stream.into_secure(ctx, address.as_str()) {
Ok(s) => s,
Err(err) => {
return Err(FileTransferError::new_ex(