diff --git a/.circleci/config.yml b/.circleci/config.yml index 349a03fa..65e3557f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 diff --git a/oqsprov/oqsprov_capabilities.c b/oqsprov/oqsprov_capabilities.c index 894a261c..0e7e12e3 100644 --- a/oqsprov/oqsprov_capabilities.c +++ b/oqsprov/oqsprov_capabilities.c @@ -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" diff --git a/scripts/fullbuild.sh b/scripts/fullbuild.sh index b781b219..aaa381f9 100755 --- a/scripts/fullbuild.sh +++ b/scripts/fullbuild.sh @@ -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 diff --git a/test/oqs_test_groups.c b/test/oqs_test_groups.c index aed820b8..d73e85f5 100644 --- a/test/oqs_test_groups.c +++ b/test/oqs_test_groups.c @@ -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; diff --git a/test/oqs_test_tlssig.c b/test/oqs_test_tlssig.c index ea21d2d2..24aa0cf1 100644 --- a/test/oqs_test_tlssig.c +++ b/test/oqs_test_tlssig.c @@ -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; diff --git a/test/tlstest_helpers.c b/test/tlstest_helpers.c index cbfaaa31..52a49f96 100644 --- a/test/tlstest_helpers.c +++ b/test/tlstest_helpers.c @@ -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()); }