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

Jump to bottom

Fix for curl build #6594

Merged
merged 5 commits into from
Jul 12, 2023
Merged

Fix for curl build #6594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bcbeef7
Fix for curl build
Jul 11, 2023
1329543
Other miscellaneous fixes
Jul 11, 2023
5fbe319
Remove references to config.h from test headers
Jul 11, 2023
e140a83
Add curl gh actions test
Jul 11, 2023
f30364a
Fix test
Jul 11, 2023
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
41 changes: 41 additions & 0 deletions .github/workflows/curl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: curl Test

on:
push:
workflow_call:

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master
- name: autogen
run: ./autogen.sh
- name: configure
run: ./configure --enable-all
- name: make
run: make
- name: install
run: sudo make install
- uses: actions/checkout@master
with:
repository: curl/curl
path: curl
- name: Install test dependency
working-directory: ./curl
run: sudo apt-get install nghttp2
- name: curl buildconf
working-directory: ./curl
run: ./buildconf
- name: curl configure
working-directory: ./curl
run: ./configure --with-wolfssl
- name: curl make
working-directory: ./curl
run: make
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably a good idea to call make -j to get it building faster.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah good suggestion. I'll add it when I'm doing another PR

- name: curl unit tests
working-directory: ./curl
run: make test

2 changes: 2 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ jobs:
uses: ./.github/workflows/zephyr.yml
hitch:
uses: ./.github/workflows/hitch.yml
curl:
uses: ./.github/workflows/curl.yml
# TODO: Currently this test fails. Enable it once it becomes passing.
# haproxy:
# uses: ./.github/workflows/haproxy.yml
3 changes: 2 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1726,7 +1726,8 @@ AC_ARG_ENABLE([error-queue-per-thread],

if test "$ENABLED_ERRORQUEUEPERTHREAD" = "check"
then
AS_IF([test "$thread_ls_on" = "no"],
AS_IF([test "$thread_ls_on" = "no" ||
test "$ENABLED_SINGLETHREADED" = "yes"],
[ENABLED_ERRORQUEUEPERTHREAD=no],
[ENABLED_ERRORQUEUEPERTHREAD=yes])
fi
Expand Down
2 changes: 1 addition & 1 deletion src/ocsp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,7 @@ WOLFSSL_OCSP_ONEREQ* wolfSSL_OCSP_request_add0_id(OcspRequest *req,
return NULL;

if (req->cid != NULL)
wolfSSL_OCSP_CERTID_free(req->cid);
wolfSSL_OCSP_CERTID_free((WOLFSSL_OCSP_CERTID*)req->cid);
/* Keep to free */
req->cid = (void*)cid;

Expand Down
6 changes: 4 additions & 2 deletions tests/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1447,7 +1447,8 @@ static int test_wolfSSL_CTX_load_verify_locations(void)
/* Get cert cache size */
ExpectIntGT(cacheSz = wolfSSL_CTX_get_cert_cache_memsize(ctx), 0);

ExpectNotNull(cache = XMALLOC(cacheSz, NULL, DYNAMIC_TYPE_TMP_BUFFER));
ExpectNotNull(cache = (byte*)XMALLOC(cacheSz, NULL,
DYNAMIC_TYPE_TMP_BUFFER));

ExpectIntEQ(wolfSSL_CTX_memsave_cert_cache(NULL, NULL, -1, NULL),
BAD_FUNC_ARG);
Expand Down Expand Up @@ -34728,7 +34729,8 @@ static int test_wolfSSL_Tls13_Key_Logging_test(void)
#endif /* OPENSSL_EXTRA && HAVE_SECRET_CALLBACK && WOLFSSL_TLS13 */
return EXPECT_RESULT();
}
#if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
#if defined(WOLFSSL_TLS13) && defined(HAVE_ECH) && \
defined(HAVE_IO_TESTS_DEPENDENCIES)
static int test_wolfSSL_Tls13_ECH_params(void)
{
EXPECT_DECLS;
Expand Down
3 changes: 0 additions & 3 deletions wolfcrypt/test/test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
typedef sword32 wc_test_ret_t;
#endif

#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <wolfssl/wolfcrypt/settings.h>

#ifdef HAVE_STACK_SIZE
Expand Down
4 changes: 1 addition & 3 deletions wolfssl/test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,8 @@
#ifndef wolfSSL_TEST_H
#define wolfSSL_TEST_H

#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <wolfssl/wolfcrypt/settings.h>
#include <wolfssl/wolfcrypt/wc_port.h>

#ifdef FUSION_RTOS
#include <fclstdio.h>
Expand Down
3 changes: 0 additions & 3 deletions wolfssl/wolfcrypt/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ decouple library dependencies with standard string, memory and so on.
#ifndef WOLF_CRYPT_TYPES_H
#define WOLF_CRYPT_TYPES_H

#ifdef HAVE_CONFIG_H
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you double check that all .c files in the library proper have this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looked like they all did. I did however find more references to config.h that I removed/replaced with the appropriate header

#include <config.h>
#endif
#include <wolfssl/wolfcrypt/settings.h>
#include <wolfssl/wolfcrypt/wc_port.h>

Expand Down