diff options
author | Simo Sorce <simo@redhat.com> | 2022-11-14 10:25:15 -0500 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2022-11-16 17:07:19 +0100 |
commit | 56de1f3ce3dc3f7618ba24d3fd658ef99587004b (patch) | |
tree | 26165ac887e231b498f5dddee52b2fa58e1c974d | |
parent | b67935515ed9428b7a867c001cb8932c9ea912e8 (diff) |
Drop explicit check for engines in opt_legacy_okay
The providers indication should always indicate that this is not a
legacy request.
This makes a check for engines redundant as the default return is that
legacy is ok if there are no explicit providers.
Fixes #19662
Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19671)
(cherry picked from commit 2fea56832780248af2aba2e4433ece2d18428515)
-rw-r--r-- | apps/lib/apps.c | 8 | ||||
-rwxr-xr-x | test/recipes/20-test_legacy_okay.t | 23 |
2 files changed, 23 insertions, 8 deletions
diff --git a/apps/lib/apps.c b/apps/lib/apps.c index 9456a21868..eea61c5b5c 100644 --- a/apps/lib/apps.c +++ b/apps/lib/apps.c @@ -3378,14 +3378,6 @@ int opt_legacy_okay(void) { int provider_options = opt_provider_option_given(); int libctx = app_get0_libctx() != NULL || app_get0_propq() != NULL; -#ifndef OPENSSL_NO_ENGINE - ENGINE *e = ENGINE_get_first(); - - if (e != NULL) { - ENGINE_free(e); - return 1; - } -#endif /* * Having a provider option specified or a custom library context or * property query, is a sure sign we're not using legacy. diff --git a/test/recipes/20-test_legacy_okay.t b/test/recipes/20-test_legacy_okay.t new file mode 100755 index 0000000000..183499f3fd --- /dev/null +++ b/test/recipes/20-test_legacy_okay.t @@ -0,0 +1,23 @@ +#! /usr/bin/env perl +# Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the Apache License 2.0 (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + +use strict; +use warnings; + +use OpenSSL::Test; + +setup("test_legacy"); + +plan tests => 3; + +ok(run(app(['openssl', 'rand', '-out', 'rand.txt', '256'])), "Generate random file"); + +ok(run(app(['openssl', 'dgst', '-sha256', 'rand.txt'])), "Generate a digest"); + +ok(!run(app(['openssl', 'dgst', '-sha256', '-propquery', 'foo=1', + 'rand.txt'])), "Fail to generate a digest"); |