Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

alpha12 tag preparation #13

Merged
merged 1 commit into from
Mar 11, 2021
Merged

alpha12 tag preparation #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ jobs:
- run:
name: Clone and build OpenSSL(3)
command: |
git clone --depth 1 --branch master git://git.openssl.org/openssl.git openssl &&
cd openssl && ./config --prefix=$(echo $(pwd)/../.local) && make -j 4 && make install_dev && cd ..
git clone --branch master git://git.openssl.org/openssl.git openssl &&
cd openssl && git checkout openssl-3.0.0-alpha12 && ./config --prefix=$(echo $(pwd)/../.local) && make -j 4 && make install_dev && cd ..
- run:
name: Build OQS-OpenSSL provider
command: |
Expand Down
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ Example for building and installing OpenSSL 3.0 in `.local`:
OpenSSL (3.0) is not yet released in a production version. For [limitations
see here](https://wiki.openssl.org/index.php/OpenSSL_3.0#STATUS_of_current_development).

*Note*: Building has last been validated with OpenSSL tag `openssl-3.0.0-alpha12`
even though the goal of this project is to always build and work with the latest
OpenSSL `master` branch code.

### liboqs

Example for building and installing liboqs in `.local`:
Expand Down
5 changes: 2 additions & 3 deletions oqsprov/oqs_sig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_END
};

static const OSSL_PARAM *oqs_sig_gettable_ctx_params(ossl_unused void *vpoqs_sigctx, ossl_unused void *vctx)
static const OSSL_PARAM *oqs_sig_gettable_ctx_params(ossl_unused void *vpoqs_sigctx)
{
OQS_SIG_PRINTF("OQS SIG provider: gettable_ctx_params called\n");
return known_gettable_ctx_params;
Expand Down Expand Up @@ -537,8 +537,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_END
};

static const OSSL_PARAM *oqs_sig_settable_ctx_params(ossl_unused void *vpsm2ctx,
ossl_unused void *provctx)
static const OSSL_PARAM *oqs_sig_settable_ctx_params(ossl_unused void *vpsm2ctx)
{
/*
* TODO(3.0): Should this function return a different set of settable ctx
Expand Down