From 8c8d5ebfa4a8dfcb4fdfda310c2ceb8625d27b01 Mon Sep 17 00:00:00 2001 From: Michael Baentsch Date: Tue, 13 Apr 2021 10:01:59 +0200 Subject: [PATCH] OSSLalpha15 (#18) * follow upstream to alpha15 * CCI updates --- .circleci/config.yml | 4 ++-- oqsprov/oqs_kmgmt.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e33aa136..700553d9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ localCheckout: &localCheckout cp -a /tmp/_circleci_local_build_repo/.git ${PROJECT_PATH} jobs: ubuntu_focal: - description: A template for running OQS-OpenSSL tests on x64 Ubuntu Bionic Docker VMs + description: A template for running OQS-OpenSSL tests on x64 Ubuntu Docker VMs docker: - image: openquantumsafe/ci-ubuntu-focal-x86_64:latest steps: @@ -21,7 +21,7 @@ jobs: command: | git clone --depth 1 --branch main https://github.com/open-quantum-safe/liboqs.git && cd liboqs && mkdir _build && cd _build && - cmake -GNinja -DCMAKE_INSTALL_PREFIX=$(pwd)/../../.local -DOQS_ENABLE_KEM_classic_mceliece_348864_avx=OFF -DOQS_ENABLE_KEM_classic_mceliece_348864f_avx=OFF -DOQS_ENABLE_KEM_classic_mceliece_460896f_avx=OFF -DOQS_ENABLE_KEM_classic_mceliece_6688128f_avx=OFF -DOQS_ENABLE_KEM_classic_mceliece_6960119f_avx=OFF -DOQS_ENABLE_KEM_classic_mceliece_8192128_avx=OFF -DOQS_ENABLE_KEM_classic_mceliece_8192128f_avx=OFF -DOQS_ENABLE_KEM_classic_mceliece_460896_avx=OFF -DOQS_ENABLE_KEM_classic_mceliece_6688128_avx=OFF -DOQS_ENABLE_KEM_classic_mceliece_6960119_avx=OFF .. && ninja install && + cmake -GNinja -DCMAKE_INSTALL_PREFIX=$(pwd)/../../.local .. && ninja install && cd .. - run: name: Clone and build OpenSSL(3) diff --git a/oqsprov/oqs_kmgmt.c b/oqsprov/oqs_kmgmt.c index 20df2439..2052eecb 100644 --- a/oqsprov/oqs_kmgmt.c +++ b/oqsprov/oqs_kmgmt.c @@ -164,7 +164,7 @@ static int oqsx_export(void *keydata, int selection, OSSL_CALLBACK *param_cb, goto err; ret = param_cb(params, cbarg); - OSSL_PARAM_BLD_free_params(params); + OSSL_PARAM_free(params); err: OSSL_PARAM_BLD_free(tmpl); return ret;