diff options
| author | Michael Baentsch <57787676+baentsch@users.noreply.github.com> | 2023-06-13 17:30:30 +0200 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-06-15 00:39:10 +0200 |
| commit | f3f3f86a14dac76f3079fb50cabd14fdab418bb0 (patch) | |
| tree | c450bad1b138b6dd2697f92661b591950df21378 | |
| parent | Only take note of the ack deadline if we can actually issue an ack (diff) | |
| download | openssl-f3f3f86a14dac76f3079fb50cabd14fdab418bb0.tar.xz openssl-f3f3f86a14dac76f3079fb50cabd14fdab418bb0.zip | |
updated (lib+)oqsprovider to latest releases
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21194)
| m--------- | oqs-provider | 0 | ||||
| -rw-r--r-- | test/README-external.md | 8 | ||||
| -rwxr-xr-x | test/recipes/95-test_external_oqsprovider_data/oqsprovider.sh | 25 |
3 files changed, 16 insertions, 17 deletions
diff --git a/oqs-provider b/oqs-provider -Subproject 3f3d8a8cf331c73a26fe93a598273997cb54eb4 +Subproject 8c746d7e294d6948c2f361a8f2fa376a63a2db3 diff --git a/test/README-external.md b/test/README-external.md index e1f4819fae..cb25717727 100644 --- a/test/README-external.md +++ b/test/README-external.md @@ -111,14 +111,12 @@ explicitly run (with more debugging): $ make test VERBOSE=1 TESTS=test_external_oqsprovider The environment variable `OQS_SKIP_TESTS` can be set to select tests and -algorithms to be skipped. If not set, the "rainbow" algorithm set as well as -the (OQS-)OpenSSL1.1.1 compatibility tests will not be executed. So, for -example to exclude the "mceliece" and "kyber" algorithms execute +algorithms to be skipped, e.g. as follows: - OQS_SKIP_TESTS=mceliece,kyber make test TESTS=test_external_oqsprovider + OQS_SKIP_TESTS=kyber make test TESTS=test_external_oqsprovider The names of all supported quantum-safe algorithms are available at -<https://github.com/open-quantum-safe/openssl#supported-algorithms> +<https://github.com/open-quantum-safe/oqs-provider#algorithms> Updating test suites ==================== diff --git a/test/recipes/95-test_external_oqsprovider_data/oqsprovider.sh b/test/recipes/95-test_external_oqsprovider_data/oqsprovider.sh index 23c1cb5f14..ef804961de 100755 --- a/test/recipes/95-test_external_oqsprovider_data/oqsprovider.sh +++ b/test/recipes/95-test_external_oqsprovider_data/oqsprovider.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2022-2023 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 @@ -45,29 +45,30 @@ echo " OPENSSL_ROOT_DIR: $OPENSSL_ROOT_DIR" echo " OpenSSL version: $OPENSSL_VERSION" echo "------------------------------------------------------------------" -if [ ! -d $SRCTOP/oqs-provider/oqs ]; then -# disable rainbow family by default; all further config options listed at +if [ ! -d $SRCTOP/oqs-provider/.local ]; then +# this version of oqsprovider dependent on v0.8.0 of liboqs, so set this; +# also be sure to use this openssl for liboqs-internal OpenSSL use; +# see all libops config options listed at # https://github.com/open-quantum-safe/liboqs/wiki/Customizing-liboqs ( cd $SRCTOP/oqs-provider \ - && git clone --depth 1 --branch 0.7.2 https://github.com/open-quantum-safe/liboqs.git \ + && git clone --depth 1 --branch 0.8.0 https://github.com/open-quantum-safe/liboqs.git \ && cd liboqs \ && mkdir build \ && cd build \ - && cmake -DOQS_ENABLE_SIG_RAINBOW=OFF -DCMAKE_INSTALL_PREFIX=$SRCTOP/oqs-provider/oqs .. \ + && cmake -DOPENSSL_ROOT_DIR=$OPENSSL_ROOT_DIR -DCMAKE_INSTALL_PREFIX=$SRCTOP/oqs-provider/.local .. \ && make \ && make install ) fi echo " CWD: $PWD" -cmake $SRCTOP/oqs-provider -DCMAKE_INCLUDE_PATH=$SRCTOP/oqs-provider/oqs -DCMAKE_PREFIX_PATH=$SRCTOP/oqs-provider/oqs -DOPENSSL_ROOT_DIR="$OPENSSL_ROOT_DIR" -DOPENSSL_BLDTOP=$BLDTOP -B _build && cmake --build _build +liboqs_DIR=$SRCTOP/oqs-provider/.local cmake $SRCTOP/oqs-provider -DOPENSSL_ROOT_DIR="$OPENSSL_ROOT_DIR" -B _build && cmake --build _build export CTEST_OUTPUT_ON_FAILURE=1 export HARNESS_OSSL_PREFIX='' export OPENSSL_APP="$O_EXE/openssl" -if [ -z "$OQS_SKIP_TESTS" ]; then - export OQS_SKIP_TESTS="rainbow,111" -fi -export OPENSSL_MODULES=$PWD/_build/oqsprov -export OQS_PROVIDER_TESTSCRIPTS=$SRCTOP/oqs-provider -$SRCTOP/oqs-provider/scripts/runtests.sh +export OPENSSL_MODULES=$PWD/_build/lib +export OQS_PROVIDER_TESTSCRIPTS=$SRCTOP/oqs-provider/scripts +export OPENSSL_CONF=$OQS_PROVIDER_TESTSCRIPTS/openssl-ca.cnf +# Be verbose if harness is verbose: +$SRCTOP/oqs-provider/scripts/runtests.sh -V |