[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  1b4417abb89978af5b57c0ff68b02e439cd17a9a (commit)
      from  23b2fc0b501d6635dd821014aec8ff16689cbb6a (commit)


- Log -----------------------------------------------------------------
commit 1b4417abb89978af5b57c0ff68b02e439cd17a9a
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Sep 30 20:17:55 2020 +1000

    apps: remove internal/cryptlib.h include that isn't used
    
    [extended tests]
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/13047)

-----------------------------------------------------------------------

Summary of changes:
 apps/openssl.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps/openssl.c b/apps/openssl.c
index b426f594b3..c0cad3a54f 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -7,7 +7,6 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <internal/cryptlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -110,8 +109,10 @@ static size_t internal_trace_cb(const char *buf, size_t cnt,
 
     switch (cmd) {
     case OSSL_TRACE_CTRL_BEGIN:
-        if (!ossl_assert(!trace_data->ingroup))
+        if (trace_data->ingroup) {
+            BIO_printf(bio_err, "ERROR: tracing already started\n");
             return 0;
+        }
         trace_data->ingroup = 1;
 
         tid = CRYPTO_THREAD_get_current_id();
@@ -123,14 +124,18 @@ static size_t internal_trace_cb(const char *buf, size_t cnt,
         BIO_set_prefix(trace_data->bio, buffer);
         break;
     case OSSL_TRACE_CTRL_WRITE:
-        if (!ossl_assert(trace_data->ingroup))
+        if (!trace_data->ingroup) {
+            BIO_printf(bio_err, "ERROR: writing when tracing not started\n");
             return 0;
+        }
 
         ret = BIO_write(trace_data->bio, buf, cnt);
         break;
     case OSSL_TRACE_CTRL_END:
-        if (!ossl_assert(trace_data->ingroup))
+        if (!trace_data->ingroup) {
+            BIO_printf(bio_err, "ERROR: finishing when tracing not started\n");
             return 0;
+        }
         trace_data->ingroup = 0;
 
         BIO_set_prefix(trace_data->bio, NULL);