From: Norbert Pocs Date: Mon, 8 Sep 2025 15:11:33 +0000 (+0200) Subject: Remove GOST external tests X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d688be3b95a782e7bc58d0763aad4a470a6567a5;p=thirdparty%2Fopenssl.git Remove GOST external tests Signed-off-by: Norbert Pocs Reviewed-by: Saša Nedvědický Reviewed-by: Richard Levitte Reviewed-by: Neil Horman Reviewed-by: Matt Caswell Reviewed-by: Saša Nedvědický Reviewed-by: Eugene Syromiatnikov (Merged from https://github.com/openssl/openssl/pull/29305) --- diff --git a/test/README-external.md b/test/README-external.md index a98c6976c89..2d7e71d79b6 100644 --- a/test/README-external.md +++ b/test/README-external.md @@ -65,28 +65,6 @@ krb5 will automatically adapt its test suite to account for the configuration of your system. Certain tests may require more installed packages to run. No tests are expected to fail. -GOST engine test suite -====================== - -Much like the PYCA/Cryptography test suite, this builds and runs the GOST engine -tests against the local OpenSSL build. - -You will need a git checkout of gost-engine at the top level: - - $ git submodule update --init - -Then configure/build OpenSSL enabling external tests: - - $ ./config enable-external-tests - $ make - -GOST engine requires CMake for the build process. - -GOST engine tests will then be run as part of the rest of the suite, or can be -explicitly run (with more debugging): - - $ make test VERBOSE=1 TESTS=test_external_gost_engine - OQSprovider test suite ====================== diff --git a/test/recipes/95-test_external_gost_engine.t b/test/recipes/95-test_external_gost_engine.t deleted file mode 100644 index 37daaf7ecae..00000000000 --- a/test/recipes/95-test_external_gost_engine.t +++ /dev/null @@ -1,28 +0,0 @@ -#! /usr/bin/env perl -# Copyright 2015-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 OpenSSL::Test; -use OpenSSL::Test::Utils; -use OpenSSL::Test qw/:DEFAULT data_file bldtop_dir srctop_dir cmdstr/; - -setup("test_external_gost_engine"); - -plan skip_all => "No external tests in this configuration" - if disabled("external-tests"); -plan skip_all => "GOST engine tests not available on Windows or VMS" - if $^O =~ /^(VMS|MSWin32)$/; -plan skip_all => "GOST engine tests only available in a shared build" - if disabled("shared"); -plan skip_all => "GOST engine tests not supported in out of tree builds" - if bldtop_dir() ne srctop_dir(); - -plan tests => 1; - -ok(run(cmd(["sh", data_file("gost_engine.sh")])), - "running GOST engine tests"); diff --git a/test/recipes/95-test_external_gost_engine_data/gost_engine.sh b/test/recipes/95-test_external_gost_engine_data/gost_engine.sh deleted file mode 100755 index 08317227412..00000000000 --- a/test/recipes/95-test_external_gost_engine_data/gost_engine.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# -# Copyright 2020-2025 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 - -# -# OpenSSL external testing using the GOST engine -# -set -e - -PWD="$(pwd)" - -SRCTOP="$(cd $SRCTOP; pwd)" -BLDTOP="$(cd $BLDTOP; pwd)" - -if [ "$SRCTOP" != "$BLDTOP" ] ; then - echo "Out of tree builds not supported with gost_engine test!" - exit 1 -fi - -O_EXE="$BLDTOP/apps" -O_BINC="$BLDTOP/include" -O_SINC="$SRCTOP/include" -O_LIB="$BLDTOP" - -unset OPENSSL_CONF - -export PATH="$O_EXE:$PATH" -export LD_LIBRARY_PATH="$O_LIB:$LD_LIBRARY_PATH" -export OPENSSL_ROOT_DIR="$O_LIB" - -# Check/Set openssl version -OPENSSL_VERSION=`openssl version | cut -f 2 -d ' '` - -echo "------------------------------------------------------------------" -echo "Testing OpenSSL using GOST engine:" -echo " CWD: $PWD" -echo " SRCTOP: $SRCTOP" -echo " BLDTOP: $BLDTOP" -echo " OPENSSL_ROOT_DIR: $OPENSSL_ROOT_DIR" -echo " OpenSSL version: $OPENSSL_VERSION" -echo "------------------------------------------------------------------" - -cmake $SRCTOP/gost-engine -DOPENSSL_ROOT_DIR="$OPENSSL_ROOT_DIR" -DOPENSSL_ENGINES_DIR="$OPENSSL_ROOT_DIR/engines" -make -export CTEST_OUTPUT_ON_FAILURE=1 -export OPENSSL_ENGINES="$PWD/bin" -export OPENSSL_APP="$O_EXE/openssl" -make test -make tcl_tests