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

Bugfix: s_client occasionally would sleep in select() when it should

Browse Source 
have checked SSL_pending() first.
Submitted by:
Reviewed by:
PR:
This commit is contained in:
Bodo Möller 1999-04-09 20:54:25 +00:00
parent 9d892e2855
commit c7ac31e26e
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -5,6 +5,10 @@
Changes between 0.9.2b and 0.9.3 Changes between 0.9.2b and 0.9.3
*) Bugfix: s_client occasionally would sleep in select() when
it should have checked SSL_pending() first.
[Bodo Moeller]
*) New functions DSA_do_sign and DSA_do_verify to provide access to *) New functions DSA_do_sign and DSA_do_verify to provide access to
the raw DSA values prior to ASN.1 encoding. the raw DSA values prior to ASN.1 encoding.
[Ulf Möller] [Ulf Möller]

45
apps/s_client.c
View File

@ -154,7 +154,7 @@ char **argv;
char *cert_file=NULL,*key_file=NULL; char *cert_file=NULL,*key_file=NULL;
char *CApath=NULL,*CAfile=NULL,*cipher=NULL; char *CApath=NULL,*CAfile=NULL,*cipher=NULL;
int reconnect=0,badop=0,verify=SSL_VERIFY_NONE,bugs=0; int reconnect=0,badop=0,verify=SSL_VERIFY_NONE,bugs=0;
int write_tty,read_tty,write_ssl,read_ssl,tty_on; 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;
SSL_METHOD *meth=NULL; SSL_METHOD *meth=NULL;
@ -439,31 +439,36 @@ re_start:
} }
} }
ssl_pending = read_ssl && SSL_pending(con);
if (!ssl_pending)
#ifndef WINDOWS #ifndef WINDOWS
if (tty_on)
{ {
if (read_tty) FD_SET(fileno(stdin),&readfds); if (tty_on)
if (write_tty) FD_SET(fileno(stdout),&writefds); {
} if (read_tty) FD_SET(fileno(stdin),&readfds);
if (write_tty) FD_SET(fileno(stdout),&writefds);
}
#endif #endif
if (read_ssl) if (read_ssl)
FD_SET(SSL_get_fd(con),&readfds); FD_SET(SSL_get_fd(con),&readfds);
if (write_ssl) if (write_ssl)
FD_SET(SSL_get_fd(con),&writefds); FD_SET(SSL_get_fd(con),&writefds);
/* printf("mode tty(%d %d%d) ssl(%d%d)\n", /* printf("mode tty(%d %d%d) ssl(%d%d)\n",
tty_on,read_tty,write_tty,read_ssl,write_ssl);*/ tty_on,read_tty,write_tty,read_ssl,write_ssl);*/
i=select(width,&readfds,&writefds,NULL,NULL); i=select(width,&readfds,&writefds,NULL,NULL);
if ( i < 0) if ( i < 0)
{ {
BIO_printf(bio_err,"bad select %d\n", BIO_printf(bio_err,"bad select %d\n",
get_last_socket_error()); get_last_socket_error());
goto shut; goto shut;
/* goto end; */ /* goto end; */
}
} }
if (FD_ISSET(SSL_get_fd(con),&writefds)) if (!ssl_pending && FD_ISSET(SSL_get_fd(con),&writefds))
{ {
k=SSL_write(con,&(cbuf[cbuf_off]), k=SSL_write(con,&(cbuf[cbuf_off]),
(unsigned int)cbuf_len); (unsigned int)cbuf_len);
@ -531,7 +536,7 @@ re_start:
} }
} }
#ifndef WINDOWS #ifndef WINDOWS
else if (FD_ISSET(fileno(stdout),&writefds)) else if (!ssl_pending && FD_ISSET(fileno(stdout),&writefds))
{ {
i=write(fileno(stdout),&(sbuf[sbuf_off]),sbuf_len); i=write(fileno(stdout),&(sbuf[sbuf_off]),sbuf_len);
@ -551,7 +556,7 @@ re_start:
} }
} }
#endif #endif
else if (FD_ISSET(SSL_get_fd(con),&readfds)) else if (ssl_pending || FD_ISSET(SSL_get_fd(con),&readfds))
{ {
#ifdef RENEG #ifdef RENEG
{ static int iiii; if (++iiii == 52) { SSL_renegotiate(con); iiii=0; } } { static int iiii; if (++iiii == 52) { SSL_renegotiate(con); iiii=0; } }