public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated (lib+)oqsprovider to latest releases

Browse source 
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>

(cherry picked from commit f3f3f86a14)

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26408)
This commit is contained in:
Michael Baentsch 2023-06-13 17:30:30 +02:00 • committed by Tomas Mraz
parent b022d66e28
commit 66f481d98f
3 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
oqs-provider

@ -1 +1 @@
Subproject commit 3f3d8a8cf331c73a26fe93a598273997cb54eb4f Subproject commit 8c746d7e294d6948c2f361a8f2fa376a63a2db30

8
test/README-external.md
View file

@ -111,14 +111,12 @@ explicitly run (with more debugging):
$ make test VERBOSE=1 TESTS=test_external_oqsprovider $ make test VERBOSE=1 TESTS=test_external_oqsprovider
The environment variable `OQS_SKIP_TESTS` can be set to select tests and 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 algorithms to be skipped, e.g. as follows:
the (OQS-)OpenSSL1.1.1 compatibility tests will not be executed. So, for
example to exclude the "mceliece" and "kyber" algorithms execute
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 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 Updating test suites
==================== ====================

25
test/recipes/95-test_external_oqsprovider_data/oqsprovider.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/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 # 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 # 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 " OpenSSL version: $OPENSSL_VERSION"
echo "------------------------------------------------------------------" echo "------------------------------------------------------------------"
if [ ! -d $SRCTOP/oqs-provider/oqs ]; then if [ ! -d $SRCTOP/oqs-provider/.local ]; then
# disable rainbow family by default; all further config options listed at # 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 # https://github.com/open-quantum-safe/liboqs/wiki/Customizing-liboqs
( (
cd $SRCTOP/oqs-provider \ 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 \ && cd liboqs \
&& mkdir build \ && mkdir build \
&& cd 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 \
&& make install && make install
) )
fi fi
echo " CWD: $PWD" 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 CTEST_OUTPUT_ON_FAILURE=1
export HARNESS_OSSL_PREFIX='' export HARNESS_OSSL_PREFIX=''
export OPENSSL_APP="$O_EXE/openssl" export OPENSSL_APP="$O_EXE/openssl"
if [ -z "$OQS_SKIP_TESTS" ]; then export OPENSSL_MODULES=$PWD/_build/lib
export OQS_SKIP_TESTS="rainbow,111" export OQS_PROVIDER_TESTSCRIPTS=$SRCTOP/oqs-provider/scripts
fi export OPENSSL_CONF=$OQS_PROVIDER_TESTSCRIPTS/openssl-ca.cnf
export OPENSSL_MODULES=$PWD/_build/oqsprov # Be verbose if harness is verbose:
export OQS_PROVIDER_TESTSCRIPTS=$SRCTOP/oqs-provider $SRCTOP/oqs-provider/scripts/runtests.sh -V
$SRCTOP/oqs-provider/scripts/runtests.sh