From c0aaa0793b7113fd6b06dfcddcf036acce6e4ad4 Mon Sep 17 00:00:00 2001 From: Michael Baentsch <57787676+baentsch@users.noreply.github.com> Date: Sun, 24 Dec 2023 15:20:57 +0100 Subject: [PATCH] reverting to dev mode --- .github/workflows/linux.yml | 25 ++++++++++++------------- .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 6 +++--- CMakeLists.txt | 2 +- RELEASE.md | 24 +++++++++++++++++++++--- 5 files changed, 38 insertions(+), 21 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index cf45ea3f..bd6aa911 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -50,23 +50,22 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - name: Full build - run: OPENSSL_BRANCH=${{ matrix.ossl-branch }} LIBOQS_BRANCH=0.9.1 ./scripts/fullbuild.sh + run: OPENSSL_BRANCH=${{ matrix.ossl-branch }} LIBOQS_BRANCH=main ./scripts/fullbuild.sh - name: Enable sibling oqsprovider for testing run: cd build/lib && ln -s oqsprovider.so oqsprovider2.so - name: Test run: ./scripts/runtests.sh -V -# Need to disable due to missing HQC update cherry-pick in liboqs release: -# - name: Verify nothing changes on re-generate code -# run: | -# apt-get update && apt-get install -y clang-format && \ -# git config --global user.name "ciuser" && \ -# git config --global user.email "ci@openquantumsafe.org" && \ -# git config --global --add safe.directory `pwd` && \ -# export LIBOQS_SRC_DIR=`pwd`/liboqs && \ -# ! pip3 install -r oqs-template/requirements.txt 2>&1 | grep ERROR && \ -# python3 oqs-template/generate.py && \ -# find . -type f -and '(' -name '*.h' -or -name '*.c' -or -name '*.inc' ')' | xargs clang-format -i && \ -# ! git status | grep modified + - name: Verify nothing changes on re-generate code + run: | + apt-get update && apt-get install -y clang-format && \ + git config --global user.name "ciuser" && \ + git config --global user.email "ci@openquantumsafe.org" && \ + git config --global --add safe.directory `pwd` && \ + export LIBOQS_SRC_DIR=`pwd`/liboqs && \ + ! pip3 install -r oqs-template/requirements.txt 2>&1 | grep ERROR && \ + python3 oqs-template/generate.py && \ + find . -type f -and '(' -name '*.h' -or -name '*.c' -or -name '*.inc' ')' | xargs clang-format -i && \ + ! git status | grep modified - name: Build .deb install package run: cpack working-directory: build diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 96835adb..6ecc434f 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -35,7 +35,7 @@ jobs: with: set-safe-directory: true repository: open-quantum-safe/liboqs - ref: 0.9.1 + ref: main path: liboqs - name: Retrieve OpenSSL32 from cache id: cache-openssl32 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5304d1ac..409f1f73 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -38,7 +38,7 @@ jobs: with: set-safe-directory: true repository: open-quantum-safe/liboqs - ref: 0.9.1 + ref: main path: liboqs - name: Install cygwin uses: cygwin/cygwin-install-action@master @@ -125,7 +125,7 @@ jobs: with: set-safe-directory: true repository: open-quantum-safe/liboqs - ref: 0.9.1 + ref: main path: liboqs - uses: ilammy/msvc-dev-cmd@v1 with: @@ -238,7 +238,7 @@ jobs: with: set-safe-directory: true repository: open-quantum-safe/liboqs - ref: 0.9.1 + ref: main path: liboqs - uses: ilammy/msvc-dev-cmd@v1 with: diff --git a/CMakeLists.txt b/CMakeLists.txt index 632f44cc..901422ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ else() cmake_minimum_required(VERSION 3.0 FATAL_ERROR) endif() project(oqs-provider LANGUAGES C) -set(OQSPROVIDER_VERSION_TEXT "0.5.3") +set(OQSPROVIDER_VERSION_TEXT "0.5.4-dev") set(CMAKE_C_STANDARD 11) set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON) if(CMAKE_BUILD_TYPE STREQUAL "Debug") diff --git a/RELEASE.md b/RELEASE.md index b545549e..3518dcb5 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,3 +1,24 @@ +# oqs-provider 0.5.4-dev + +## About + +The **Open Quantum Safe (OQS) project** has the goal of developing and prototyping quantum-resistant cryptography. More information on OQS can be found on our website: https://openquantumsafe.org/ and on Github at https://github.com/open-quantum-safe/. + +**oqs-provider** is a standalone [OpenSSL 3](https://github.com/openssl/openssl) [provider](https://www.openssl.org/docs/manmaster/man7/provider.html) enabling [liboqs](https://github.com/open-quantum-safe/liboqs)-based quantum-safe and [hybrid key exchange](https://datatracker.ietf.org/doc/draft-ietf-pquip-pqt-hybrid-terminology) for TLS 1.3, as well as quantum-safe and hybrid X.509 certificate generation, CMS, CMP and `dgst` (signature) operations. + +When deployed, the `oqs-provider` binary (shared library) thus adds support for quantum-safe cryptographic operations to any standard OpenSSL(v3) installation. The ultimate goal is that all `openssl` functionality shall be [PQC-enabled](https://csrc.nist.gov/projects/post-quantum-cryptography). + +In general, the oqs-provider `main` branch is meant to be usable in conjunction with the `main` branch of [liboqs](https://github.com/open-quantum-safe/liboqs) and the `master` branch of [OpenSSL](https://github.com/openssl/openssl). + +Further details on building, testing and use can be found in [README.md](https://github.com/open-quantum-safe/oqs-provider/blob/main/README.md). See in particular limitations on intended use. + +## Release notes + +This is version 0.5.4-dev of oqs-provider. + +Previous Release Notes +====================== + # oqs-provider 0.5.3 ## About @@ -51,9 +72,6 @@ This release also makes available ready-to-run binaries for Linux (.so), Windows **Full Changelog**: https://github.com/open-quantum-safe/oqs-provider/compare/0.5.2...0.5.3 -Previous Release Notes -====================== - # oqs-provider 0.5.2 ## About