From: Andreas Metzler <ametzler@bebt.de>
Date: Mon, 1 May 2017 17:20:38 +0000 (+0200)
Subject: gnutls-cli: Use CRLF with --starttls-proto=smtp.
X-Git-Tag: gnutls_3_6_0~599
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=057dbb0ca55de8f835565a7e515eb2a95def6a42;p=thirdparty%2Fgnutls.git

gnutls-cli: Use CRLF with --starttls-proto=smtp.

Closes https://gitlab.com/gnutls/gnutls/issues/200
---

diff --git a/src/socket.c b/src/socket.c
index 223df5177f..16ed40720f 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -229,10 +229,10 @@ socket_starttls(socket_st * socket)
 			printf("Negotiating SMTP STARTTLS\n");
 
 		wait_for_text(socket, "220 ", 4);
-		snprintf(buf, sizeof(buf), "EHLO %s\n", socket->hostname);
+		snprintf(buf, sizeof(buf), "EHLO %s\r\n", socket->hostname);
 		send_line(socket, buf);
 		wait_for_text(socket, "250 ", 4);
-		send_line(socket, "STARTTLS\n");
+		send_line(socket, "STARTTLS\r\n");
 		wait_for_text(socket, "220 ", 4);
 	} else if (strcasecmp(socket->app_proto, "imap") == 0 || strcasecmp(socket->app_proto, "imap2") == 0) {
 		if (socket->verbose)