diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2007-08-06 13:32:50 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2007-08-06 13:32:50 +0000 |
| commit | c3f1b6cefd9892935b5321ca1c42d7a5b6ac7f27 (patch) | |
| tree | c3573cf523ba063a0ba9a77cf44e084c820d1fa0 /lib | |
| parent | 17fe06b728123439a3cd9f304b3c1c2fc840285b (diff) | |
Correctly NUL terminate the message buffer that is used with the
-starttls option. Without this openssl s_client -starttls crashed with
malloc.conf -> J. OK deraadt@, hshoexer@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/src/apps/s_client.c | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/lib/libssl/src/apps/s_client.c b/lib/libssl/src/apps/s_client.c index a70735b9dca..78bc10d3153 100644 --- a/lib/libssl/src/apps/s_client.c +++ b/lib/libssl/src/apps/s_client.c @@ -243,6 +243,7 @@ int MAIN(int argc, char **argv) char *cbuf=NULL,*sbuf=NULL,*mbuf=NULL; int cbuf_len,cbuf_off; int sbuf_len,sbuf_off; + int mbuf_len,mbuf_off; fd_set readfds,writefds; char *port=PORT_STR; int full_log=1; @@ -291,7 +292,7 @@ int MAIN(int argc, char **argv) if ( ((cbuf=OPENSSL_malloc(BUFSIZZ)) == NULL) || ((sbuf=OPENSSL_malloc(BUFSIZZ)) == NULL) || - ((mbuf=OPENSSL_malloc(BUFSIZZ)) == NULL)) + ((mbuf=OPENSSL_malloc(BUFSIZZ + 1)) == NULL)) /* NUL byte */ { BIO_printf(bio_err,"out of memory\n"); goto end; @@ -596,23 +597,42 @@ re_start: cbuf_off=0; sbuf_len=0; sbuf_off=0; + mbuf_len=0; + mbuf_off=0; /* This is an ugly hack that does a lot of assumptions */ if (starttls_proto == 1) { - BIO_read(sbio,mbuf,BUFSIZZ); + mbuf_off = mbuf_len = BIO_read(sbio,mbuf,BUFSIZZ); + if (mbuf_len == -1) + { + BIO_printf(bio_err,"BIO_read failed\n"); + goto end; + } BIO_printf(sbio,"EHLO some.host.name\r\n"); - BIO_read(sbio,mbuf,BUFSIZZ); + mbuf_len = BIO_read(sbio,mbuf + mbuf_off,BUFSIZZ - mbuf_off); + if (mbuf_len == -1) + { + BIO_printf(bio_err,"BIO_read failed\n"); + goto end; + } BIO_printf(sbio,"STARTTLS\r\n"); BIO_read(sbio,sbuf,BUFSIZZ); } if (starttls_proto == 2) { - BIO_read(sbio,mbuf,BUFSIZZ); + mbuf_len = BIO_read(sbio,mbuf,BUFSIZZ); + if (mbuf_len == -1) + { + BIO_printf(bio_err,"BIO_read failed\n"); + goto end; + } BIO_printf(sbio,"STLS\r\n"); BIO_read(sbio,sbuf,BUFSIZZ); } + mbuf[mbuf_off + mbuf_len] = '\0'; + for (;;) { FD_ZERO(&readfds); |