diff options
| author | Pauli <paul.dale@oracle.com> | 2020-09-30 20:17:55 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-10-07 14:12:53 +1000 |
| commit | 1b4417abb89978af5b57c0ff68b02e439cd17a9a (patch) | |
| tree | 0ebce982e28658c561fd4d220e7e22510e55373f | |
| parent | 23b2fc0b501d6635dd821014aec8ff16689cbb6a (diff) | |
| download | openssl-1b4417abb89978af5b57c0ff68b02e439cd17a9a.zip openssl-1b4417abb89978af5b57c0ff68b02e439cd17a9a.tar.gz openssl-1b4417abb89978af5b57c0ff68b02e439cd17a9a.tar.bz2 | |
apps: remove internal/cryptlib.h include that isn't used
[extended tests]
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/13047)
| -rw-r--r-- | apps/openssl.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/apps/openssl.c b/apps/openssl.c index b426f59..c0cad3a 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); |