Revert "Check directory is able to create files for various -out option"

[openssl.git] / apps / s_time.c

diff --git a/apps/s_time.c b/apps/s_time.c
index 998ef72b88224ea7ec441d823de713ede9b492b9..5688f4f5fb46155c0b8bf3c1ea80ddc8b049df63 100644 (file)
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.

  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy


@@ -7,8 +7,6 @@
  * https://www.openssl.org/source/license.html
  */
 
  * https://www.openssl.org/source/license.html
  */
 

-#define NO_SHUTDOWN
-

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -17,45 +15,38 @@
 
 #ifndef OPENSSL_NO_SOCK
 
 
 #ifndef OPENSSL_NO_SOCK
 

-#define USE_SOCKETS

 #include "apps.h"
 #include "apps.h"

+#include "progs.h"

 #include <openssl/x509.h>
 #include <openssl/ssl.h>
 #include <openssl/pem.h>
 #include "s_apps.h"
 #include <openssl/err.h>
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
 #include <openssl/pem.h>
 #include "s_apps.h"
 #include <openssl/err.h>

+#include <internal/sockets.h>

 #if !defined(OPENSSL_SYS_MSDOS)
 # include OPENSSL_UNISTD
 #endif
 
 #if !defined(OPENSSL_SYS_MSDOS)
 # include OPENSSL_UNISTD
 #endif
 

-#undef ioctl
-#define ioctl ioctlsocket
-

 #define SSL_CONNECT_NAME        "localhost:4433"
 
 #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"
 
 static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx);
 
 #define SECONDS 30
 #define SECONDSSTR "30"
 
 static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx);
 

+/*
+ * Define a HTTP get command globally.
+ * Also define the size of the command, this is two bytes less than
+ * the size of the string because the %s is replaced by the URL.
+ */

 static const char fmt_http_get_cmd[] = "GET %s HTTP/1.0\r\n\r\n";
 static const char fmt_http_get_cmd[] = "GET %s HTTP/1.0\r\n\r\n";

+static const size_t fmt_http_get_cmd_size = sizeof(fmt_http_get_cmd) - 2;

 
 typedef enum OPTION_choice {
     OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 
 typedef enum OPTION_choice {
     OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,

-    OPT_CONNECT, OPT_CIPHER, OPT_CERT, OPT_NAMEOPT, OPT_KEY, OPT_CAPATH,
-    OPT_CAFILE, OPT_NOCAPATH, OPT_NOCAFILE, OPT_NEW, OPT_REUSE, OPT_BUGS,
-    OPT_VERIFY, OPT_TIME, OPT_SSL3,
+    OPT_CONNECT, OPT_CIPHER, OPT_CIPHERSUITES, OPT_CERT, OPT_NAMEOPT, OPT_KEY,
+    OPT_CAPATH, OPT_CAFILE, OPT_NOCAPATH, OPT_NOCAFILE, OPT_NEW, OPT_REUSE,
+    OPT_BUGS, OPT_VERIFY, OPT_TIME, OPT_SSL3,

     OPT_WWW
 } OPTION_CHOICE;
 
     OPT_WWW
 } OPTION_CHOICE;
 


@@ -63,7 +54,9 @@ const OPTIONS s_time_options[] = {
     {"help", OPT_HELP, '-', "Display this summary"},
     {"connect", OPT_CONNECT, 's',
      "Where to connect as post:port (default is " SSL_CONNECT_NAME ")"},
     {"help", OPT_HELP, '-', "Display this summary"},
     {"connect", OPT_CONNECT, 's',
      "Where to connect as post:port (default is " SSL_CONNECT_NAME ")"},

-    {"cipher", OPT_CIPHER, 's', "Cipher to use, see 'openssl ciphers'"},
+    {"cipher", OPT_CIPHER, 's', "TLSv1.2 and below cipher list to be used"},
+    {"ciphersuites", OPT_CIPHERSUITES, 's',
+     "Specify TLSv1.3 ciphersuites to be used"},

     {"cert", OPT_CERT, '<', "Cert file to use, PEM format assumed"},
     {"nameopt", OPT_NAMEOPT, 's', "Various certificate name options"},
     {"key", OPT_KEY, '<', "File with key, PEM; default is -cert file"},
     {"cert", OPT_CERT, '<', "Cert file to use, PEM format assumed"},
     {"nameopt", OPT_NAMEOPT, 's', "Various certificate name options"},
     {"key", OPT_KEY, '<', "File with key, PEM; default is -cert file"},


@@ -100,7 +93,8 @@ int s_time_main(int argc, char **argv)
     SSL *scon = NULL;
     SSL_CTX *ctx = NULL;
     const SSL_METHOD *meth = NULL;
     SSL *scon = NULL;
     SSL_CTX *ctx = NULL;
     const SSL_METHOD *meth = NULL;

-    char *CApath = NULL, *CAfile = NULL, *cipher = NULL, *www_path = NULL;
+    char *CApath = NULL, *CAfile = NULL, *cipher = NULL, *ciphersuites = NULL;
+    char *www_path = NULL;

     char *host = SSL_CONNECT_NAME, *certfile = NULL, *keyfile = NULL, *prog;
     double totalTime = 0.0;
     int noCApath = 0, noCAfile = 0;
     char *host = SSL_CONNECT_NAME, *certfile = NULL, *keyfile = NULL, *prog;
     double totalTime = 0.0;
     int noCApath = 0, noCAfile = 0;


@@ -164,6 +158,9 @@ int s_time_main(int argc, char **argv)
         case OPT_CIPHER:
             cipher = opt_arg();
             break;
         case OPT_CIPHER:
             cipher = opt_arg();
             break;

+        case OPT_CIPHERSUITES:
+            ciphersuites = opt_arg();
+            break;

         case OPT_BUGS:
             st_bugs = 1;
             break;
         case OPT_BUGS:
             st_bugs = 1;
             break;


@@ -173,7 +170,7 @@ int s_time_main(int argc, char **argv)
             break;
         case OPT_WWW:
             www_path = opt_arg();
             break;
         case OPT_WWW:
             www_path = opt_arg();

-            buf_size = strlen(www_path) + sizeof(fmt_http_get_cmd) - 2;  /* 2 is for %s */
+            buf_size = strlen(www_path) + fmt_http_get_cmd_size;

             if (buf_size > sizeof(buf)) {
                 BIO_printf(bio_err, "%s: -www option is too long\n", prog);
                 goto end;
             if (buf_size > sizeof(buf)) {
                 BIO_printf(bio_err, "%s: -www option is too long\n", prog);
                 goto end;


@@ -190,21 +187,20 @@ int s_time_main(int argc, char **argv)
 
     if (cipher == NULL)
         cipher = getenv("SSL_CIPHER");
 
     if (cipher == NULL)
         cipher = getenv("SSL_CIPHER");

-    if (cipher == NULL) {
-        BIO_printf(bio_err, "No CIPHER specified\n");
-        goto end;
-    }

 
     if ((ctx = SSL_CTX_new(meth)) == NULL)
         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);
     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 (ciphersuites != NULL && !SSL_CTX_set_ciphersuites(ctx, ciphersuites))

         goto end;
     if (!set_cert_stuff(ctx, certfile, keyfile))
         goto end;
         goto end;
     if (!set_cert_stuff(ctx, certfile, keyfile))
         goto end;


@@ -230,24 +226,20 @@ int s_time_main(int argc, char **argv)
             goto end;
 
         if (www_path != NULL) {
             goto end;
 
         if (www_path != NULL) {

-            buf_len = BIO_snprintf(buf, sizeof buf,
-                                   fmt_http_get_cmd, www_path);
-            if (SSL_write(scon, buf, buf_len) <= 0)
+            buf_len = BIO_snprintf(buf, sizeof(buf), fmt_http_get_cmd,
+                                   www_path);
+            if (buf_len <= 0 || SSL_write(scon, buf, buf_len) <= 0)

                 goto end;
             while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
                 bytes_read += i;
         }
                 goto end;
             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);
         SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);

-#else
-        SSL_shutdown(scon);
-#endif

         BIO_closesocket(SSL_get_fd(scon));
 
         nConn += 1;
         BIO_closesocket(SSL_get_fd(scon));
 
         nConn += 1;

-        if (SSL_session_reused(scon))
+        if (SSL_session_reused(scon)) {

             ver = 'r';
             ver = 'r';

-        else {
+        } else {

             ver = SSL_version(scon);
             if (ver == TLS1_VERSION)
                 ver = 't';
             ver = SSL_version(scon);
             if (ver == TLS1_VERSION)
                 ver = 't';


@@ -288,18 +280,13 @@ int s_time_main(int argc, char **argv)
     }
 
     if (www_path != NULL) {
     }
 
     if (www_path != NULL) {

-        buf_len = BIO_snprintf(buf, sizeof buf,
-                               fmt_http_get_cmd, www_path);
-        if (SSL_write(scon, buf, buf_len) <= 0)
+        buf_len = BIO_snprintf(buf, sizeof(buf), fmt_http_get_cmd, www_path);
+        if (buf_len <= 0 || SSL_write(scon, buf, buf_len) <= 0)

             goto end;
             goto end;

-        while (SSL_read(scon, buf, sizeof(buf)) > 0)
+        while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)

             continue;
     }
             continue;
     }

-#ifdef NO_SHUTDOWN

     SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
     SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);

-#else
-    SSL_shutdown(scon);
-#endif

     BIO_closesocket(SSL_get_fd(scon));
 
     nConn = 0;
     BIO_closesocket(SSL_get_fd(scon));
 
     nConn = 0;


@@ -318,25 +305,21 @@ int s_time_main(int argc, char **argv)
         if ((doConnection(scon, host, ctx)) == NULL)
             goto end;
 
         if ((doConnection(scon, host, ctx)) == NULL)
             goto end;
 

-        if (www_path) {
-            BIO_snprintf(buf, sizeof buf, "GET %s HTTP/1.0\r\n\r\n",
-                         www_path);
-            if (SSL_write(scon, buf, strlen(buf)) <= 0)
+        if (www_path != NULL) {
+            buf_len = BIO_snprintf(buf, sizeof(buf), fmt_http_get_cmd,
+                                   www_path);
+            if (buf_len <= 0 || SSL_write(scon, buf, buf_len) <= 0)

                 goto end;
             while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
                 bytes_read += i;
         }
                 goto end;
             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);
         SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);

-#else
-        SSL_shutdown(scon);
-#endif

         BIO_closesocket(SSL_get_fd(scon));
 
         nConn += 1;
         BIO_closesocket(SSL_get_fd(scon));
 
         nConn += 1;

-        if (SSL_session_reused(scon))
+        if (SSL_session_reused(scon)) {

             ver = 'r';
             ver = 'r';

-        else {
+        } else {

             ver = SSL_version(scon);
             if (ver == TLS1_VERSION)
                 ver = 't';
             ver = SSL_version(scon);
             if (ver == TLS1_VERSION)
                 ver = 't';


@@ -362,7 +345,7 @@ int s_time_main(int argc, char **argv)
  end:
     SSL_free(scon);
     SSL_CTX_free(ctx);
  end:
     SSL_free(scon);
     SSL_CTX_free(ctx);

-    return (ret);
+    return ret;

 }
 
 /*-
 }
 
 /*-


@@ -372,13 +355,13 @@ static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx)
 {
     BIO *conn;
     SSL *serverCon;
 {
     BIO *conn;
     SSL *serverCon;

-    int width, i;
-    fd_set readfds;
+    int i;

 
     if ((conn = BIO_new(BIO_s_connect())) == NULL)
 
     if ((conn = BIO_new(BIO_s_connect())) == NULL)

-        return (NULL);
+        return NULL;

 
     BIO_set_conn_hostname(conn, host);
 
     BIO_set_conn_hostname(conn, host);

+    BIO_set_conn_mode(conn, BIO_SOCK_NODELAY);

 
     if (scon == NULL)
         serverCon = SSL_new(ctx);
 
     if (scon == NULL)
         serverCon = SSL_new(ctx);


@@ -390,26 +373,7 @@ static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx)
     SSL_set_bio(serverCon, conn, conn);
 
     /* ok, lets connect */
     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)
     if (i <= 0) {
         BIO_printf(bio_err, "ERROR\n");
         if (verify_args.error != X509_V_OK)


@@ -422,6 +386,17 @@ static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx)
         return NULL;
     }
 
         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 */
     return serverCon;
 }
 #endif /* OPENSSL_NO_SOCK */