RT2667: Add IRC support to -starttls (cfb4f1ef) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

apps/s_client.c

+66 −2

Original line number	Diff line number	Diff line
		@@ -175,6 +175,7 @@ typedef unsigned int u_int;

		#undef BUFSIZZ
		#define BUFSIZZ 1024*8
		#define S_CLIENT_IRC_READ_TIMEOUT 8

		extern int verify_depth;
		extern int verify_error;
		@@ -516,7 +517,7 @@ OPTIONS s_client_options[] = {
		{"tls1_1", OPT_TLS1_1, '-', "Just use TLSv1.1"},
		{"tls1", OPT_TLS1, '-', "Just use TLSv1"},
		{"starttls", OPT_STARTTLS, 's',
		"Use the STARTTLS command before starting TLS"},
		"Use the appropriate STARTTLS command before starting TLS"},
		{"xmpphost", OPT_XMPPHOST, 's',
		"Host to use with \"-starttls xmpp[-server]\""},
		{"rand", OPT_RAND, 's',
		@@ -614,7 +615,8 @@ typedef enum PROTOCOL_choice {
		PROTO_TELNET,
		PROTO_XMPP,
		PROTO_XMPP_SERVER,
		PROTO_CONNECT
		PROTO_CONNECT,
		PROTO_IRC
		} PROTOCOL_CHOICE;

		static OPT_PAIR services[] = {
		@@ -625,6 +627,7 @@ static OPT_PAIR services[] = {
		{"xmpp", PROTO_XMPP},
		{"xmpp-server", PROTO_XMPP_SERVER},
		{"telnet", PROTO_TELNET},
		{"irc", PROTO_IRC},
		{NULL}
		};

		@@ -1644,6 +1647,67 @@ int s_client_main(int argc, char **argv)
		}
		}
		break;
		case PROTO_IRC:
		{
		int numeric;
		BIO *fbio = BIO_new(BIO_f_buffer());

		BIO_push(fbio, sbio);
		BIO_printf(fbio, "STARTTLS\r\n");
		(void)BIO_flush(fbio);
		width = SSL_get_fd(con) + 1;

		do {
		numeric = 0;

		FD_ZERO(&readfds);
		openssl_fdset(SSL_get_fd(con), &readfds);
		timeout.tv_sec = S_CLIENT_IRC_READ_TIMEOUT;
		timeout.tv_usec = 0;
		/*
		* If the IRCd doesn't respond within
		* S_CLIENT_IRC_READ_TIMEOUT seconds, assume
		* it doesn't support STARTTLS. Many IRCds
		* will not give _any_ sort of response to a
		* STARTTLS command when it's not supported.
		*/
		if (!BIO_get_buffer_num_lines(fbio)
		&& !BIO_pending(fbio)
		&& !BIO_pending(sbio)
		&& select(width, (void *)&readfds, NULL, NULL,
		&timeout) < 1) {
		BIO_printf(bio_err,
		"Timeout waiting for response (%d seconds).\n",
		S_CLIENT_IRC_READ_TIMEOUT);
		break;
		}

		mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
		if (mbuf_len < 1 \|\| sscanf(mbuf, "%*s %d", &numeric) != 1)
		break;
		/* :example.net 451 STARTTLS :You have not registered */
		/* :example.net 421 STARTTLS :Unknown command */
		if ((numeric == 451 \|\| numeric == 421)
		&& strstr(mbuf, "STARTTLS") != NULL) {
		BIO_printf(bio_err, "STARTTLS not supported: %s", mbuf);
		break;
		}
		if (numeric == 691) {
		BIO_printf(bio_err, "STARTTLS negotiation failed: ");
		ERR_print_errors(bio_err);
		break;
		}
		} while (numeric != 670);

		(void)BIO_flush(fbio);
		BIO_pop(fbio);
		BIO_free(fbio);
		if (numeric != 670) {
		BIO_printf(bio_err, "Server does not support STARTTLS.\n");
		ret = 1;
		goto shut;
		}
		}
		}

		for (;;) {

doc/apps/s_client.pod

+2 −2

Original line number	Diff line number	Diff line
		@@ -298,8 +298,8 @@ command for more information.

		send the protocol-specific message(s) to switch to TLS for communication.
		B<protocol> is a keyword for the intended protocol. Currently, the only
		supported keywords are "smtp", "pop3", "imap", "ftp", "xmpp",
		and "xmpp-server".
		supported keywords are "smtp", "pop3", "imap", "ftp", "xmpp", "xmpp-server",
		and "irc."

		=item B<-xmpphost hostname>