FIX - Re-add openssl

Author: Elrendio

Cargo.toml

@@ -19,17 +19,18 @@ path = "src/lib.rs"
 
 [features]
 # Enable support of FTPS which requires openssl
-secure = ["native-tls"]
+secure = ["openssl"]
 
 # Add debug output (to STDOUT) of commands sent to the server
 # and lines read from the server
 debug_print = []
 
 [dependencies]
-lazy_static = "1.4.0"
-regex = "1.4.2"
-chrono = "0.4.19"
+lazy_static = "1"
+regex = "1"
+chrono = "0.4"
+openssl = { version = "0.10", optional = true }
 
 [dependencies.native-tls]
-version = "^0.2"
+version = "0.2"
 optional = true

examples/connecting.rs

@@ -1,11 +1,10 @@
 extern crate ftp;
 
 use ftp::{FtpError, FtpStream};
-use std::io::Cursor;
-use std::str;
+use std::{io::Cursor, str};
 
 fn test_ftp(addr: &str, user: &str, pass: &str) -> Result<(), FtpError> {
-    let mut ftp_stream = FtpStream::connect((addr, 21)).unwrap();
+    let (mut ftp_stream, _welcome_msg) = FtpStream::connect((addr, 21)).unwrap();
     ftp_stream.login(user, pass).unwrap();
     println!("current dir: {}", ftp_stream.pwd().unwrap());
 

src/data_stream.rs

@@ -1,13 +1,20 @@
-#[cfg(feature = "secure")]
+#[cfg(all(feature = "secure", feature = "native-tls"))]
 use native_tls::TlsStream;
-use std::io::{Read, Result, Write};
-use std::net::TcpStream;
+#[cfg(all(feature = "secure", not(feature = "native-tls")))]
+use openssl::ssl::SslStream;
+
+use std::{
+    io::{Read, Result, Write},
+    net::TcpStream,
+};
 
 /// Data Stream used for communications
 #[derive(Debug)]
 pub enum DataStream {
     Tcp(TcpStream),
-    #[cfg(feature = "secure")]
+    #[cfg(all(feature = "secure", not(feature = "native-tls")))]
+    Ssl(SslStream<TcpStream>),
+    #[cfg(all(feature = "secure", feature = "native-tls"))]
     Ssl(TlsStream<TcpStream>),
 }