Skip to content

CVPN-2575: refresh PR10492 patch with latest upstream changes#365

Merged
kp-mariappan-ramasamy merged 2 commits into
mainfrom
wolfssl-pr10492
Jun 2, 2026
Merged

CVPN-2575: refresh PR10492 patch with latest upstream changes#365
kp-mariappan-ramasamy merged 2 commits into
mainfrom
wolfssl-pr10492

Conversation

@kp-mariappan-ramasamy

@kp-mariappan-ramasamy kp-mariappan-ramasamy commented May 28, 2026

Copy link
Copy Markdown
Contributor

PR #363 has been done before the upstream PR is merged and there were some changes in the upstream before merging.

So update our patch to reflect the exact changes.

Primarily renaming cflag in build.rs from WOLFSSL_DTLS13_5_9_0_COMPAT to WOLFSSL_DTLS13_ECHO_LEGACY_SESSION_ID.

Changes

Pull PR10492 head (6 commits, mailbox format), then trim:

  • drop .wolfssl_known_macro_extras hunks (PATCH 1, 5) and entire PATCH 4/6 (revert pair) — that file's surrounding context does not exist in 5.9.1.
  • rewrite test_dtls.h hunks in PATCH 2 to drop test_dtls_set_session_min_downgrade refs (also not in 5.9.1).
  • space-prefix bare empty context lines so 'git apply' (Windows path in build.rs) accepts them.

Pull PR10492 head (6 commits, mailbox format), then trim:
- drop .wolfssl_known_macro_extras hunks (PATCH 1, 5) and entire PATCH 4/6
  (revert pair) — that file's surrounding context does not exist in 5.9.1.
- rewrite test_dtls.h hunks in PATCH 2 to drop test_dtls_set_session_min_downgrade
  refs (also not in 5.9.1).
- space-prefix bare empty context lines so 'git apply' (Windows path in
  build.rs) accepts them.

Renames cflag in build.rs from WOLFSSL_DTLS13_5_9_0_COMPAT to
WOLFSSL_DTLS13_ECHO_LEGACY_SESSION_ID to match the renamed macro from PATCH 5.
@github-actions

github-actions Bot commented May 28, 2026

Copy link
Copy Markdown

Code coverage summary for 3947675:

Filename                             Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
wolfssl-sys/src/lib.rs                    34                 0   100.00%           4                 0   100.00%          22                 0   100.00%           0                 0         -
wolfssl/src/aes256.rs                    166                 8    95.18%          11                 0   100.00%         124                 4    96.77%           0                 0         -
wolfssl/src/chacha20_poly1305.rs          75                 2    97.33%           5                 0   100.00%          66                 2    96.97%           0                 0         -
wolfssl/src/context.rs                   401               173    56.86%          41                14    65.85%         286               110    61.54%           0                 0         -
wolfssl/src/error.rs                      44                12    72.73%           5                 1    80.00%          43                10    76.74%           0                 0         -
wolfssl/src/lib.rs                        81                15    81.48%          11                 1    90.91%          72                13    81.94%           0                 0         -
wolfssl/src/rng.rs                        71                 9    87.32%           6                 0   100.00%          42                 3    92.86%           0                 0         -
wolfssl/src/ssl.rs                      1277               337    73.61%          86                25    70.93%         862               251    70.88%           0                 0         -
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                   2149               556    74.13%         169                41    75.74%        1517               393    74.09%           0                 0         -

✅ Region coverage 74% passes
✅ Line coverage 74% passes

@github-actions

Copy link
Copy Markdown

🚀 Release Plan

Crate Previous version New version Release? Comment
wolfssl-sys 4.1.0 4.2.0 ✅ Release
wolfssl 7.1.0 7.2.0 ✅ Release after wolfssl-sys

@kp-mariappan-ramasamy
kp-mariappan-ramasamy marked this pull request as ready for review May 28, 2026 08:27
@kp-mariappan-ramasamy
kp-mariappan-ramasamy requested a review from a team as a code owner May 28, 2026 08:27
@kp-mariappan-ramasamy kp-mariappan-ramasamy changed the title wolfssl-sys: refresh PR10492 patch with latest upstream changes CVPN-2575: refresh PR10492 patch with latest upstream changes May 29, 2026

@kp-weiwen-goh kp-weiwen-goh left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Verified commits in patch match PR description

@kp-mariappan-ramasamy
kp-mariappan-ramasamy merged commit 1311249 into main Jun 2, 2026
23 checks passed
@kp-mariappan-ramasamy
kp-mariappan-ramasamy deleted the wolfssl-pr10492 branch June 2, 2026 02:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants