generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add STARTTLS support for IMAP and FTP.

Browse Source 
Submitted by Kees Cook <kees@outflux.net>
This commit is contained in:
Richard Levitte 2007-02-16 18:12:16 +00:00
parent 30e5e8aca5
commit 85c6749216
2 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
apps/s_client.c
View File

@ -316,7 +316,7 @@ static void sc_usage(void)
BIO_printf(bio_err," -starttls prot - use the STARTTLS command before starting TLS\n"); BIO_printf(bio_err," -starttls prot - use the STARTTLS command before starting TLS\n");
BIO_printf(bio_err," for those protocols that support it, where\n"); BIO_printf(bio_err," for those protocols that support it, where\n");
BIO_printf(bio_err," 'prot' defines which one to assume. Currently,\n"); BIO_printf(bio_err," 'prot' defines which one to assume. Currently,\n");
BIO_printf(bio_err," only \"smtp\" and \"pop3\" are supported.\n"); BIO_printf(bio_err," only \"smtp\", \"pop3\", \"imap\", and \"ftp\" are supported.\n");
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
BIO_printf(bio_err," -engine id - Initialise and use the specified engine\n"); BIO_printf(bio_err," -engine id - Initialise and use the specified engine\n");
#endif #endif
@ -348,6 +348,15 @@ static int MS_CALLBACK ssl_servername_cb(SSL *s, int *ad, void *arg)
} }
#endif #endif
enum
{
PROTO_OFF = 0,
PROTO_SMTP,
PROTO_POP3,
PROTO_IMAP,
PROTO_FTP,
};
int MAIN(int, char **); int MAIN(int, char **);
int MAIN(int argc, char **argv) int MAIN(int argc, char **argv)
@ -374,12 +383,13 @@ int MAIN(int argc, char **argv)
int write_tty,read_tty,write_ssl,read_ssl,tty_on,ssl_pending; int write_tty,read_tty,write_ssl,read_ssl,tty_on,ssl_pending;
SSL_CTX *ctx=NULL; SSL_CTX *ctx=NULL;
int ret=1,in_init=1,i,nbio_test=0; int ret=1,in_init=1,i,nbio_test=0;
int starttls_proto = 0; int starttls_proto = PROTO_OFF;
int prexit = 0, vflags = 0; int prexit = 0, vflags = 0;
const SSL_METHOD *meth=NULL; const SSL_METHOD *meth=NULL;
int socket_type=SOCK_STREAM; int socket_type=SOCK_STREAM;
BIO *sbio; BIO *sbio;
char *inrand=NULL; char *inrand=NULL;
int mbuf_len=0;
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
char *engine_id=NULL; char *engine_id=NULL;
ENGINE *e=NULL; ENGINE *e=NULL;
@ -610,9 +620,13 @@ int MAIN(int argc, char **argv)
if (--argc < 1) goto bad; if (--argc < 1) goto bad;
++argv; ++argv;
if (strcmp(*argv,"smtp") == 0) if (strcmp(*argv,"smtp") == 0)
starttls_proto = 1; starttls_proto = PROTO_SMTP;
else if (strcmp(*argv,"pop3") == 0) else if (strcmp(*argv,"pop3") == 0)
starttls_proto = 2; starttls_proto = PROTO_POP3;
else if (strcmp(*argv,"imap") == 0)
starttls_proto = PROTO_IMAP;
else if (strcmp(*argv,"ftp") == 0)
starttls_proto = PROTO_FTP;
else else
goto bad; goto bad;
} }
@ -898,18 +912,40 @@ re_start:
sbuf_off=0; sbuf_off=0;
/* This is an ugly hack that does a lot of assumptions */ /* This is an ugly hack that does a lot of assumptions */
if (starttls_proto == 1) if (starttls_proto == PROTO_SMTP)
{ {
BIO_read(sbio,mbuf,BUFSIZZ); /* wait for multi-line response to end from SMTP */
do
{
mbuf_len = BIO_read(sbio,mbuf,BUFSIZZ);
}
while (mbuf_len>3 && mbuf[3]=='-');
BIO_printf(sbio,"STARTTLS\r\n"); BIO_printf(sbio,"STARTTLS\r\n");
BIO_read(sbio,sbuf,BUFSIZZ); BIO_read(sbio,sbuf,BUFSIZZ);
} }
if (starttls_proto == 2) else if (starttls_proto == PROTO_POP3)
{ {
BIO_read(sbio,mbuf,BUFSIZZ); BIO_read(sbio,mbuf,BUFSIZZ);
BIO_printf(sbio,"STLS\r\n"); BIO_printf(sbio,"STLS\r\n");
BIO_read(sbio,sbuf,BUFSIZZ); BIO_read(sbio,sbuf,BUFSIZZ);
} }
else if (starttls_proto == PROTO_IMAP)
{
BIO_read(sbio,mbuf,BUFSIZZ);
BIO_printf(sbio,"0 STARTTLS\r\n");
BIO_read(sbio,sbuf,BUFSIZZ);
}
else if (starttls_proto == PROTO_FTP)
{
/* wait for multi-line response to end from FTP */
do
{
mbuf_len = BIO_read(sbio,mbuf,BUFSIZZ);
}
while (mbuf_len>3 && mbuf[3]=='-');
BIO_printf(sbio,"AUTH TLS\r\n");
BIO_read(sbio,sbuf,BUFSIZZ);
}
for (;;) for (;;)
{ {
@ -940,7 +976,7 @@ re_start:
{ {
BIO_printf(bio_err,"%s",mbuf); BIO_printf(bio_err,"%s",mbuf);
/* We don't need to know any more */ /* We don't need to know any more */
starttls_proto = 0; starttls_proto = PROTO_OFF;
} }
if (reconnect) if (reconnect)

2
doc/apps/s_client.pod
View File

@ -194,7 +194,7 @@ command for more information.
send the protocol-specific message(s) to switch to TLS for communication. send the protocol-specific message(s) to switch to TLS for communication.
B<protocol> is a keyword for the intended protocol. Currently, the only B<protocol> is a keyword for the intended protocol. Currently, the only
supported keywords are "smtp" and "pop3". supported keywords are "smtp", "pop3", "imap", and "ftp".
=item B<-engine id> =item B<-engine id>