[openssl-commits] [openssl] OpenSSL_1_1_0-stable update
bernd.edlinger at hotmail.de
bernd.edlinger at hotmail.de
Wed Mar 21 16:29:07 UTC 2018
The branch OpenSSL_1_1_0-stable has been updated
via 178a2a6f1c25d05d801544e6f18963726d90ac0b (commit)
from 329aa3412ea1d8baa4fb09c976b11f9e7c46a762 (commit)
- Log -----------------------------------------------------------------
commit 178a2a6f1c25d05d801544e6f18963726d90ac0b
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date: Wed Mar 21 17:27:44 2018 +0100
Cleanup the s_time command.
Various code-cleanups.
Use SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY) insead of handling
SSL_ERROR_WANT_READ everywhere.
Turn off the linger option on connected sockets to avoid failure.
Add BIO_set_conn_mode(conn, BIO_SOCK_NODELAY) to improve thruput.
Continue test even without -cipher option as in 1.0.2.
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5698)
-----------------------------------------------------------------------
Summary of changes:
apps/s_time.c | 89 +++++++++++++++--------------------------------------------
1 file changed, 23 insertions(+), 66 deletions(-)
diff --git a/apps/s_time.c b/apps/s_time.c
index cb2a4fd..0527d53 100644
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -7,8 +7,6 @@
* https://www.openssl.org/source/license.html
*/
-#define NO_SHUTDOWN
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -28,22 +26,8 @@
# include OPENSSL_UNISTD
#endif
-#undef ioctl
-#define ioctl ioctlsocket
-
#define SSL_CONNECT_NAME "localhost:4433"
-/* no default cert. */
-/*
- * #define TEST_CERT "client.pem"
- */
-
-#undef min
-#undef max
-#define min(a,b) (((a) < (b)) ? (a) : (b))
-#define max(a,b) (((a) > (b)) ? (a) : (b))
-
-#undef SECONDS
#define SECONDS 30
#define SECONDSSTR "30"
@@ -185,21 +169,20 @@ int s_time_main(int argc, char **argv)
if (cipher == NULL)
cipher = getenv("SSL_CIPHER");
- if (cipher == NULL) {
+ if (cipher == NULL)
BIO_printf(bio_err, "No CIPHER specified\n");
- goto end;
- }
if ((ctx = SSL_CTX_new(meth)) == NULL)
goto end;
+ SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
SSL_CTX_set_quiet_shutdown(ctx, 1);
if (SSL_CTX_set_max_proto_version(ctx, max_version) == 0)
goto end;
if (st_bugs)
SSL_CTX_set_options(ctx, SSL_OP_ALL);
- if (!SSL_CTX_set_cipher_list(ctx, cipher))
+ if (cipher != NULL && !SSL_CTX_set_cipher_list(ctx, cipher))
goto end;
if (!set_cert_stuff(ctx, certfile, keyfile))
goto end;
@@ -229,16 +212,10 @@ int s_time_main(int argc, char **argv)
fmt_http_get_cmd, www_path);
if (SSL_write(scon, buf, buf_len) <= 0)
goto end;
- while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 ||
- SSL_get_error(scon, i) == SSL_ERROR_WANT_READ ||
- SSL_get_error(scon, i) == SSL_ERROR_WANT_WRITE)
- if (i > 0) bytes_read += i;
+ while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
+ bytes_read += i;
}
-#ifdef NO_SHUTDOWN
SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
-#else
- SSL_shutdown(scon);
-#endif
BIO_closesocket(SSL_get_fd(scon));
nConn += 1;
@@ -289,16 +266,10 @@ int s_time_main(int argc, char **argv)
fmt_http_get_cmd, www_path);
if (SSL_write(scon, buf, buf_len) <= 0)
goto end;
- while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 ||
- SSL_get_error(scon, i) == SSL_ERROR_WANT_READ ||
- SSL_get_error(scon, i) == SSL_ERROR_WANT_WRITE)
+ while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
continue;
}
-#ifdef NO_SHUTDOWN
SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
-#else
- SSL_shutdown(scon);
-#endif
BIO_closesocket(SSL_get_fd(scon));
nConn = 0;
@@ -322,16 +293,10 @@ int s_time_main(int argc, char **argv)
www_path);
if (SSL_write(scon, buf, strlen(buf)) <= 0)
goto end;
- while ((i = SSL_read(scon, buf, sizeof(buf))) > 0 ||
- SSL_get_error(scon, i) == SSL_ERROR_WANT_READ ||
- SSL_get_error(scon, i) == SSL_ERROR_WANT_WRITE)
- if (i > 0) bytes_read += i;
+ while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
+ bytes_read += i;
}
-#ifdef NO_SHUTDOWN
SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
-#else
- SSL_shutdown(scon);
-#endif
BIO_closesocket(SSL_get_fd(scon));
nConn += 1;
@@ -373,13 +338,13 @@ static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx)
{
BIO *conn;
SSL *serverCon;
- int width, i;
- fd_set readfds;
+ int i;
if ((conn = BIO_new(BIO_s_connect())) == NULL)
- return (NULL);
+ return NULL;
BIO_set_conn_hostname(conn, host);
+ BIO_set_conn_mode(conn, BIO_SOCK_NODELAY);
if (scon == NULL)
serverCon = SSL_new(ctx);
@@ -391,26 +356,7 @@ static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx)
SSL_set_bio(serverCon, conn, conn);
/* ok, lets connect */
- for (;;) {
- i = SSL_connect(serverCon);
- if (BIO_sock_should_retry(i)) {
- BIO_printf(bio_err, "DELAY\n");
-
- i = SSL_get_fd(serverCon);
- width = i + 1;
- FD_ZERO(&readfds);
- openssl_fdset(i, &readfds);
- /*
- * Note: under VMS with SOCKETSHR the 2nd parameter is currently
- * of type (int *) whereas under other systems it is (void *) if
- * you don't have a cast it will choke the compiler: if you do
- * have a cast then you can either go for (int *) or (void *).
- */
- select(width, (void *)&readfds, NULL, NULL, NULL);
- continue;
- }
- break;
- }
+ i = SSL_connect(serverCon);
if (i <= 0) {
BIO_printf(bio_err, "ERROR\n");
if (verify_args.error != X509_V_OK)
@@ -423,6 +369,17 @@ static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx)
return NULL;
}
+#if defined(SOL_SOCKET) && defined(SO_LINGER)
+ {
+ struct linger no_linger;
+
+ no_linger.l_onoff = 1;
+ no_linger.l_linger = 0;
+ (void) setsockopt(SSL_get_fd(serverCon), SOL_SOCKET, SO_LINGER,
+ (char*)&no_linger, sizeof(no_linger));
+ }
+#endif
+
return serverCon;
}
#endif /* OPENSSL_NO_SOCK */
More information about the openssl-commits
mailing list