From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Wed, 7 Feb 2018 23:28:30 +0000 (+0100)
Subject: wget: do not ask for TLS-encrypted downloads on plain ftp:// URLs
X-Git-Tag: 1_29_0~255
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=237a900bc5654c865298b33a70dee60e2cd05dbc;p=oweals%2Fbusybox.git

wget: do not ask for TLS-encrypted downloads on plain ftp:// URLs

function                                             old     new   delta
wget_main                                           2422    2431      +9

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

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) {