1 files changed, 4 insertions, 3 deletions

diff --git a/src/usr.bin/openssl/s_time.c b/src/usr.bin/openssl/s_time.c
index 906d36228f..91a6855d88 100644
--- a/src/usr.bin/openssl/s_time.c
+++ b/src/usr.bin/openssl/s_time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_time.c,v 1.29 2018/08/22 20:36:24 cheloha Exp $ */
+/* $OpenBSD: s_time.c,v 1.30 2018/08/28 02:14:22 cheloha Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -376,11 +376,12 @@ run_test(SSL *scon)
         if (s_time_config.www_path != NULL) {
                 retval = snprintf(buf, sizeof buf,
                     "GET %s HTTP/1.0\r\n\r\n", s_time_config.www_path);
-                if ((size_t)retval >= sizeof buf) {
+                if (retval == -1 || retval >= sizeof buf) {
                         fprintf(stderr, "URL too long\n");
                         return 0;
                 }
-                SSL_write(scon, buf, strlen(buf));
+                if (SSL_write(scon, buf, retval) != retval)
+                        return 0;
                 while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
                         bytes_read += i;
         }