fix examples to follow options.h config by JacobBarthelmeh · Pull Request #10037 · wolfSSL/wolfssl

JacobBarthelmeh · 2026-03-20T23:12:35Z

The example server/client should not be modifying macro defines that come from how the wolfSSL library is configured when built.

wolfSSL-Fenrir-bot

Fenrir Automated Review — PR #10037

No scan targets match the changed files in this PR. Review skipped.

Copilot

Pull request overview

Updates the example client/server (and shared test helpers) to stop overriding build-time configuration macros (from options.h / settings.h) and instead compile cleanly against the wolfSSL API surface as configured.

Changes:

Removed example-level #undef/forced-define blocks related to OPENSSL_COEXIST and OpenSSL-compat headers.
Migrated examples/server/server.c off OpenSSL-compat SSL_* names to WOLFSSL* / wolfSSL_* APIs.
Added !OPENSSL_COEXIST preprocessor guards around OpenSSL-extra-only printing paths in wolfssl/test.h.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.

File	Description
`wolfssl/test.h`	Avoids OpenSSL-extra helper paths when `OPENSSL_COEXIST` is set.
`examples/server/server.c`	Switches example server from `SSL_` APIs/types to `wolfSSL_`/`WOLFSSL_*`.
`examples/client/client.c`	Stops undefining coexist macros; aligns buffer filetype constants with wolfSSL API.

Comments suppressed due to low confidence (4)

examples/server/server.c:640

In ServerWrite(), after wolfSSL_write() returns <= 0, the code calls wolfSSL_get_error(ssl, 0). wolfSSL_get_error() should be given the return value from the preceding call, otherwise the async/WANT_WRITE loop can behave incorrectly. Use wolfSSL_get_error(ssl, ret) here.

    do {
        err = 0; /* reset error */
        ret = wolfSSL_write(ssl, output, len);
        if (ret <= 0) {
            err = wolfSSL_get_error(ssl, 0);

        #ifdef WOLFSSL_ASYNC_CRYPT
            if (err == WC_NO_ERR_TRACE(WC_PENDING_E)) {
                ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);

examples/server/server.c:3665

In the early-data loop, when wolfSSL_read_early_data() returns <= 0, the code calls wolfSSL_get_error(ssl, 0) instead of passing the ret value from wolfSSL_read_early_data(). This can misreport WC_PENDING_E/WANT_READ/WANT_WRITE and break the loop logic. Pass ret to wolfSSL_get_error() here.

                    ret = wolfSSL_read_early_data(ssl, input, sizeof(input)-1,
                                                                          &len);
                    if (ret <= 0) {
                        err = wolfSSL_get_error(ssl, 0);
                    #ifdef WOLFSSL_ASYNC_CRYPT
                        if (err == WC_NO_ERR_TRACE(WC_PENDING_E)) {
                            /* returns the number of polled items or <0 for
                             * error */
                            ret = wolfSSL_AsyncPoll(ssl,
                                                    WOLF_POLL_FLAG_CHECK_HW);
                            if (ret < 0) break;
                        }

examples/server/server.c:456

In ServerEchoData(), when wolfSSL_read() returns <= 0, the code calls wolfSSL_get_error(ssl, 0) instead of passing the ret value from wolfSSL_read(). This can produce an incorrect error code and break the WANT_READ/WANT_WRITE handling. Pass ret to wolfSSL_get_error() here.

            /* Read data */
            while (rx_pos < len) {
                ret = wolfSSL_read(ssl, &buffer[rx_pos], len - rx_pos);
                if (ret <= 0) {
                    err = wolfSSL_get_error(ssl, 0);
                #ifdef WOLFSSL_ASYNC_CRYPT
                    if (err == WC_NO_ERR_TRACE(WC_PENDING_E)) {
                        ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
                        if (ret < 0) break;

examples/server/server.c:492

In ServerEchoData(), the write error path logs err when wolfSSL_write() returns a short write, but err is not set based on the write result (and may still be uninitialized if the preceding reads succeeded). Capture the error from the write call (e.g., via wolfSSL_get_error(ssl, ret) when ret <= 0, or set a deterministic value for short writes) before logging/handling it.

            WOLFSSL_ASYNC_WHILE_PENDING(
                  ret = wolfSSL_write(ssl, buffer, (int)min((word32)len, (word32)rx_pos)),
                  ret <= 0);
            if (ret != (int)min((word32)len, (word32)rx_pos)) {
                LOG_ERROR("SSL_write echo error %d\n", err);
                err_sys_ex(runWithErrors, "SSL_write failed");
            }

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

examples/server/server.c

wolfssl/test.h

examples/server/server.c

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 6 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-24T02:31:09Z

examples/server/server.c

 {
 #ifndef WOLFSSL_CALLBACKS
-    int ret = SSL_accept(ssl);
+    int ret = wolfSSL_accept(ssl);


wolfSSL_get_error should be called with the return value from the immediately preceding wolfSSL I/O call (here: ret). Passing 0 can yield WOLFSSL_ERROR_NONE and break the non-blocking retry logic. Update this call to use ret (and keep this consistent with the later wolfSSL_get_error(ssl, ret) usage in the loop).

Copilot · 2026-03-24T02:31:10Z

examples/server/server.c

 #endif
-    int error = SSL_get_error(ssl, 0);
-    SOCKET_T sockfd = (SOCKET_T)SSL_get_fd(ssl);
+    int error = wolfSSL_get_error(ssl, 0);


wolfSSL_get_error should be called with the return value from the immediately preceding wolfSSL I/O call (here: ret). Passing 0 can yield WOLFSSL_ERROR_NONE and break the non-blocking retry logic. Update this call to use ret (and keep this consistent with the later wolfSSL_get_error(ssl, ret) usage in the loop).

Suggested change

int error = wolfSSL_get_error(ssl, 0);

int error = wolfSSL_get_error(ssl, ret);

Copilot · 2026-03-24T02:31:10Z

examples/server/server.c

+                ret = wolfSSL_read(ssl, &buffer[rx_pos], len - rx_pos);
                if (ret <= 0) {
-                    err = SSL_get_error(ssl, 0);
+                    err = wolfSSL_get_error(ssl, 0);


On read failure, wolfSSL_get_error should receive the failing call’s return value (ret). Using 0 can misclassify the error and cause incorrect handling (e.g., missing WANT_READ/WANT_WRITE). Pass ret instead.

Suggested change

err = wolfSSL_get_error(ssl, 0);

err = wolfSSL_get_error(ssl, ret);

Copilot · 2026-03-24T02:31:10Z

examples/server/server.c

+        ret = wolfSSL_write(ssl, output, len);
        if (ret <= 0) {
-            err = SSL_get_error(ssl, 0);
+            err = wolfSSL_get_error(ssl, 0);


Same issue as the read path: wolfSSL_get_error should be called with the ret from wolfSSL_write. Passing 0 can incorrectly report no error and break retry/async handling.

Suggested change

err = wolfSSL_get_error(ssl, 0);

err = wolfSSL_get_error(ssl, ret);

Copilot · 2026-03-24T02:31:10Z

wolfssl/test.h

+#if defined(OPENSSL_EXTRA) && !defined(WOLFCRYPT_ONLY) && \
+    !defined(OPENSSL_COEXIST)


The new && !defined(OPENSSL_COEXIST) condition is duplicated across multiple preprocessor blocks in this header. Consider introducing a single helper macro (e.g., #define WOLFSSL_OPENSSL_EXTRA_NO_COEXIST ...) or a local #if wrapper to reduce repetition and the risk of inconsistent conditions when future blocks are updated.

Copilot · 2026-03-24T02:31:10Z

wolfssl/test.h

+#if defined(OPENSSL_EXTRA) && !defined(WOLFCRYPT_ONLY) && \
+    !defined(OPENSSL_COEXIST)


The new && !defined(OPENSSL_COEXIST) condition is duplicated across multiple preprocessor blocks in this header. Consider introducing a single helper macro (e.g., #define WOLFSSL_OPENSSL_EXTRA_NO_COEXIST ...) or a local #if wrapper to reduce repetition and the risk of inconsistent conditions when future blocks are updated.

JacobBarthelmeh self-assigned this Mar 20, 2026

JacobBarthelmeh requested review from Copilot and wolfSSL-Fenrir-bot March 20, 2026 23:12

wolfSSL-Fenrir-bot reviewed Mar 20, 2026

View reviewed changes

Copilot started reviewing on behalf of JacobBarthelmeh March 20, 2026 23:16 View session

Copilot AI reviewed Mar 20, 2026

View reviewed changes

examples/server/server.c Outdated Show resolved Hide resolved

wolfssl/test.h Show resolved Hide resolved

examples/server/server.c Outdated Show resolved Hide resolved

JacobBarthelmeh added 2 commits March 23, 2026 21:51

fix examples to follow options.h config

bab432d

adjustment for openssl coexist build with the examples

3d62a6f

JacobBarthelmeh force-pushed the nightly branch from 6a70cba to 3d62a6f Compare March 24, 2026 01:51

Copilot AI review requested due to automatic review settings March 24, 2026 02:23

Copilot started reviewing on behalf of JacobBarthelmeh March 24, 2026 02:31 View session

Copilot AI reviewed Mar 24, 2026

View reviewed changes

update macro guards for coexist build and use ret when getting SSL error

81c3d26

JacobBarthelmeh force-pushed the nightly branch from 92a20c0 to 81c3d26 Compare March 24, 2026 02:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix examples to follow options.h config#10037

fix examples to follow options.h config#10037
JacobBarthelmeh wants to merge 3 commits intowolfSSL:masterfrom
JacobBarthelmeh:nightly

JacobBarthelmeh commented Mar 20, 2026

Uh oh!

wolfSSL-Fenrir-bot left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Mar 24, 2026

Uh oh!

Copilot AI Mar 24, 2026

Uh oh!

Copilot AI Mar 24, 2026

Uh oh!

Copilot AI Mar 24, 2026

Uh oh!

Copilot AI Mar 24, 2026

Uh oh!

Copilot AI Mar 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	int error = wolfSSL_get_error(ssl, 0);
	int error = wolfSSL_get_error(ssl, ret);

	err = wolfSSL_get_error(ssl, 0);
	err = wolfSSL_get_error(ssl, ret);

		#if defined(OPENSSL_EXTRA) && !defined(WOLFCRYPT_ONLY) && \
		!defined(OPENSSL_COEXIST)

Conversation

JacobBarthelmeh commented Mar 20, 2026

Uh oh!

wolfSSL-Fenrir-bot left a comment

Choose a reason for hiding this comment

Fenrir Automated Review — PR #10037

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants