[git commit] wget: do not ask for TLS-encrypted downloads on plain ftp:// URLs

Denys Vlasenko vda.linux at googlemail.com
Wed Feb 7 23:28:30 UTC 2018


commit: https://git.busybox.net/busybox/commit/?id=237a900bc5654c865298b33a70dee60e2cd05dbc
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

function                                             old     new   delta
wget_main                                           2422    2431      +9

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 networking/wget.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/networking/wget.c b/networking/wget.c
index 633dabb57..95b88ad37 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -807,11 +807,13 @@ static FILE* prepare_ftp_session(FILE **dfpp, struct host_info *target, len_and_
 	*dfpp = open_socket(lsa);
 
 #if ENABLE_FEATURE_WGET_HTTPS
-	/* "PROT P" enables encryption of data stream.
-	 * Without it (or with "PROT C"), data is sent unencrypted.
-	 */
-	if (ftpcmd("PROT P", NULL, sfp) == 200)
-		spawn_ssl_client(target->host, fileno(*dfpp), /*flags*/ 0);
+	if (target->protocol == P_FTPS) {
+		/* "PROT P" enables encryption of data stream.
+		 * Without it (or with "PROT C"), data is sent unencrypted.
+		 */
+		if (ftpcmd("PROT P", NULL, sfp) == 200)
+			spawn_ssl_client(target->host, fileno(*dfpp), /*flags*/ 0);
+	}
 #endif
 
 	if (G.beg_range != 0) {


More information about the busybox-cvs mailing list