Skip to content

Commit

Permalink
fix formatting
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Baentsch <[email protected]>
  • Loading branch information
baentsch committed Dec 10, 2024
1 parent fc258ca commit 9ad45e4
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ jobs:
equal: [ openssl@3, << parameters.OPENSSL_PREINSTALL >> ]
steps:
- run:
name: Clone and build OpenSSL(3) dtls-1.3 feature branch
name: Clone and build OpenSSL(3) master feature branch
command: |
git clone --branch feature/dtls-1.3 https://github.com/openssl/openssl.git openssl &&
git clone --branch master https://github.com/openssl/openssl.git openssl &&
cd openssl && ./config --prefix=$(echo $(pwd)/../.local) && make -j 18 && make install_sw && cd ..
- run:
name: Build OQS-OpenSSL provider
Expand Down
2 changes: 1 addition & 1 deletion oqsprov/oqsprov_capabilities.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

// enables DTLS1.3 testing even before available in openssl master:
#if !defined(DTLS1_3_VERSION)
# define DTLS1_3_VERSION 0xFEFC
#define DTLS1_3_VERSION 0xFEFC
#endif

#include "oqs_prov.h"
Expand Down
2 changes: 1 addition & 1 deletion scripts/fullbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# EnvVar OQS_ALGS_ENABLED: If set, defines OQS algs to be enabled, e.g., "STD"
# EnvVar OPENSSL_INSTALL: If set, defines (binary) OpenSSL installation to use
# EnvVar OPENSSL_BRANCH: Defines branch/release of openssl; if set, forces source-build of OpenSSL3
# Setting this to feature/dtls-1.3 enables build&test of all PQ algs using DTLS1.3
# Setting this to feature/dtls-1.3 enables build&test of all PQ algs using DTLS1.3 feature branch
# EnvVar liboqs_DIR: If set, needs to point to a directory where liboqs has been installed to

if [[ "$OSTYPE" == "darwin"* ]]; then
Expand Down
3 changes: 2 additions & 1 deletion test/oqs_test_groups.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ static int test_oqs_groups(const char *group_name, int dtls_flag) {
goto err;
}

testresult = create_tls_objects(sctx, cctx, &serverssl, &clientssl, dtls_flag);
testresult =
create_tls_objects(sctx, cctx, &serverssl, &clientssl, dtls_flag);

if (!testresult) {
ret = -2;
Expand Down
3 changes: 2 additions & 1 deletion test/oqs_test_tlssig.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ static int test_oqs_tlssig(const char *sig_name, int dtls_flag) {
goto err;
}

testresult = create_tls_objects(sctx, cctx, &serverssl, &clientssl, dtls_flag);
testresult =
create_tls_objects(sctx, cctx, &serverssl, &clientssl, dtls_flag);

if (!testresult) {
ret = -2;
Expand Down
3 changes: 1 addition & 2 deletions test/tlstest_helpers.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ int create_tls_objects(SSL_CTX *serverctx, SSL_CTX *clientctx, SSL **sssl,
ERR_print_errors_fp(stderr);
goto err;
#endif
}
else {
} else {
s_to_c_bio = BIO_new(BIO_s_mem());
c_to_s_bio = BIO_new(BIO_s_mem());
}
Expand Down

0 comments on commit 9ad45e4

Please sign in to comment.