Add AES-GCM DEM, CryptoCb support, and devId threading to ECIES by night1rider · Pull Request #10883 · wolfSSL/wolfssl

night1rider · 2026-07-10T23:24:27Z

Add AES-GCM (128/256) as an ECIES DEM next to the AES-CBC/CTR+HMAC modes.

Only the encryption key comes from the KDF; the mac salt is bound as GCM AAD and the 16-byte tag replaces the HMAC.

The GCM DEM honors all three IV build modes, and default fixed-nonce GCM is gated behind the new WOLFSSL_ECIES_STATIC_GCM_NONCE opt-in. Adds ECIES CryptoCb encrypt/decrypt, the WOLF_CRYPTO_CB ctx getters, devId/heap threading into the DEM primitives, and test/benchmark/CI coverage.

wolfSSL-Fenrir-bot

Fenrir Automated Review — PR #10883

Scan targets checked: wolfcrypt-bugs, wolfcrypt-port-bugs, wolfcrypt-rs-bugs, wolfcrypt-src, wolfssl-bugs, wolfssl-src

Findings: 4
4 finding(s) posted as inline comments (see file-level comments below)

This review was generated automatically by Fenrir. Findings are non-blocking.

github-actions · 2026-07-11T00:44:29Z

retest this please

github-actions · 2026-07-11T01:16:49Z

MemBrowse Memory Report

gcc-arm-cortex-m4-pkcs7

FLASH: .text +448 B (+0.2%, 213,844 B / 262,144 B, total: 82% used)

linuxkm-pie

Data: __patchable_function_entries +96 B (+0.4%, 26,056 B)

linuxkm-standard

Data: __patchable_function_entries +80 B (+0.2%, 48,736 B)
No memory changes detected for:
gcc-arm-cortex-m0plus
gcc-arm-cortex-m3
gcc-arm-cortex-m4
gcc-arm-cortex-m4-baremetal
gcc-arm-cortex-m4-crypto-only
gcc-arm-cortex-m4-dtls13
gcc-arm-cortex-m4-min-ecc
gcc-arm-cortex-m4-openssl-compat
gcc-arm-cortex-m4-pq
gcc-arm-cortex-m4-rsa-only
gcc-arm-cortex-m4-sp-math
gcc-arm-cortex-m4-tls12
gcc-arm-cortex-m4-tls13
gcc-arm-cortex-m7
gcc-arm-cortex-m7-pq
gcc-arm-cortex-m7-tls13
stm32-sim-stm32h753

wolfSSL-Fenrir-bot

Fenrir Automated Review — PR #10883

Scan targets checked: wolfcrypt-bugs, wolfcrypt-port-bugs, wolfcrypt-src, wolfssl-bugs, wolfssl-src
Failed targets: wolfcrypt-rs-bugs

Findings: 1
1 finding(s) posted as inline comments (see file-level comments below)

This review was generated automatically by Fenrir. Findings are non-blocking.

wolfSSL-Fenrir-bot

Fenrir Automated Review — PR #10883

Scan targets checked: wolfcrypt-bugs, wolfcrypt-port-bugs, wolfcrypt-rs-bugs, wolfcrypt-src, wolfssl-bugs, wolfssl-src

Findings: 1
1 finding(s) posted as inline comments (see file-level comments below)

This review was generated automatically by Fenrir. Findings are non-blocking.

wolfSSL-Fenrir-bot

Fenrir Automated Review — PR #10883

Scan targets checked: wolfcrypt-bugs, wolfcrypt-port-bugs, wolfcrypt-rs-bugs, wolfcrypt-src, wolfssl-bugs, wolfssl-src

Findings: 1
1 finding(s) posted as inline comments (see file-level comments below)

This review was generated automatically by Fenrir. Findings are non-blocking.

wolfSSL-Fenrir-bot

Fenrir Automated Review — PR #10883

Scan targets checked: wolfcrypt-bugs, wolfcrypt-port-bugs, wolfcrypt-rs-bugs, wolfcrypt-src, wolfssl-bugs, wolfssl-src

No new issues found in the changed files. ✅

night1rider · 2026-07-20T15:54:22Z

Rebased to fix merge conflict

night1rider · 2026-07-23T03:45:03Z

Jenkins retest this please

JacobBarthelmeh · 2026-07-23T22:06:04Z

+        ecEncCtx* cliCtx = wc_ecc_ctx_new(REQ_RESP_CLIENT, &gRng);
+        ecEncCtx* srvCtx = wc_ecc_ctx_new(REQ_RESP_SERVER, &gRng);
+        char      encDesc[32];
+        char      decDesc[32];


Avoid magic numbers here (32), maybe WC_BENCH_MAX_LINE_LEN if it should fit on one line. Or another macro.

JacobBarthelmeh · 2026-07-23T22:10:50Z

    if ((msgSz % blockSz) != 0)
        return BAD_PADDING_E;

+    if (ecc_is_gcm(ctx->encAlgo)) {


This section of code is identical to the section at line 15700, please consider a helper function for the checks.

Created a static function helper

JacobBarthelmeh · 2026-07-23T22:13:03Z

        #else
            ctx->encAlgo  = ecAES_128_CTR;
        #endif
+    #elif !defined(NO_AES) && defined(HAVE_AESGCM)


In a GCM-only build with default IV mode, ecc_ctx_init defaults to AES-GCM but encrypt/decrypt then reject GCM with NOT_COMPILED_IN, making ECIES unusable without a manual wc_ecc_ctx_set_algo override.

Good observation, added a compile time check.

JacobBarthelmeh · 2026-07-23T22:27:45Z

    IV_SIZE_64       =  8,
    IV_SIZE_128      = 16,
    ECC_MAX_IV_SIZE  = 16,
+    AES_GCM_NONCE_SZ = 12,   /* GCM IV/nonce length for ECIES DEM */


I think these enums are duplicates of existing AES ones available. Use GCM_NONCE_MID_SZ for nonce size and in other places we use WC_AES_BLOCK_SIZE for a 16 bit tag.

removed the duplicates

Add AES-GCM (128/256) as an ECIES DEM next to the AES-CBC/CTR+HMAC modes. Only the encryption key comes from the KDF; the mac salt is bound as GCM AAD and the 16-byte tag replaces the HMAC. The GCM DEM honors all three IV build modes, and default fixed-nonce GCM is gated behind the new WOLFSSL_ECIES_STATIC_GCM_NONCE opt-in. Adds ECIES CryptoCb encrypt/decrypt, the WOLF_CRYPTO_CB ctx getters, devId/heap threading into the DEM primitives, and test/benchmark/CI coverage.

…Id field by reading it into a guarded local (PLUTON_CRYPTO_ECC/WOLF_CRYPTO_CB) that defaults to INVALID_DEVID

…path so a device that services encrypt/decrypt without a software fallback cannot reuse the ctx. Add a testwolfcrypt case that services ECIES entirely in the callback and checks a second op on the same ctx is rejected with BAD_STATE_E.

…M_NONCE

… output size into ecc_ecies_total_size helper, gate the AES-GCM ctx default on a usable IV mode, and name the benchmark ECIES desc buffer size

…e new ECIES tests

night1rider · 2026-07-24T16:24:44Z

Addressed comments, and rebased off current master.

night1rider self-assigned this Jul 10, 2026

night1rider requested a review from wolfSSL-Fenrir-bot July 10, 2026 23:24

wolfSSL-Fenrir-bot reviewed Jul 11, 2026

View reviewed changes

night1rider marked this pull request as ready for review July 11, 2026 00:28

night1rider force-pushed the Extend-ECIES branch from e077b08 to 55e2253 Compare July 11, 2026 00:50

night1rider requested a review from wolfSSL-Fenrir-bot July 11, 2026 00:50

wolfSSL-Fenrir-bot reviewed Jul 11, 2026

View reviewed changes

night1rider requested a review from wolfSSL-Fenrir-bot July 12, 2026 05:08

wolfSSL-Fenrir-bot reviewed Jul 12, 2026

View reviewed changes

night1rider force-pushed the Extend-ECIES branch from 7766011 to a1354e4 Compare July 12, 2026 06:18

night1rider requested a review from wolfSSL-Fenrir-bot July 12, 2026 06:18

wolfSSL-Fenrir-bot reviewed Jul 12, 2026

View reviewed changes

Comment thread wolfcrypt/src/ecc.c Outdated

night1rider requested review from wolfSSL-Fenrir-bot and removed request for wolfSSL-Fenrir-bot July 13, 2026 16:29

wolfSSL-Fenrir-bot reviewed Jul 20, 2026

View reviewed changes

night1rider force-pushed the Extend-ECIES branch from 9e00bad to 2d5b2c2 Compare July 20, 2026 15:54

night1rider assigned JacobBarthelmeh and wolfSSL-Bot and unassigned night1rider Jul 23, 2026

JacobBarthelmeh requested changes Jul 23, 2026

View reviewed changes

JacobBarthelmeh assigned night1rider and unassigned JacobBarthelmeh and wolfSSL-Bot Jul 23, 2026

night1rider added 2 commits July 24, 2026 10:19

Fix the ECIES DEM devId threading to compile where ecc_key has no dev…

a89ba18

…Id field by reading it into a guarded local (PLUTON_CRYPTO_ECC/WOLF_CRYPTO_CB) that defaults to INVALID_DEVID

night1rider added 5 commits July 24, 2026 10:19

Small fix to address wrong assignment

5460180

Fix ECIES clang-tidy dead-store and whitelist WOLFSSL_ECIES_STATIC_GC…

97ab34c

…M_NONCE

Address ECIES review feedback: reuse aes.h GCM size constants, factor…

09444c8

… output size into ecc_ecies_total_size helper, gate the AES-GCM ctx default on a usable IV mode, and name the benchmark ECIES desc buffer size

Use the existing KEY32 macro and a named fake overhead constant in th…

3062dea

…e new ECIES tests

night1rider force-pushed the Extend-ECIES branch from d0a3611 to 3062dea Compare July 24, 2026 16:23

night1rider assigned night1rider and unassigned night1rider Jul 24, 2026

Uh oh!

Conversation

night1rider commented Jul 10, 2026

Uh oh!

wolfSSL-Fenrir-bot left a comment

Choose a reason for hiding this comment

Fenrir Automated Review — PR #10883

Uh oh!

github-actions Bot commented Jul 11, 2026

Uh oh!

github-actions Bot commented Jul 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

MemBrowse Memory Report

Uh oh!

wolfSSL-Fenrir-bot left a comment

Choose a reason for hiding this comment

Fenrir Automated Review — PR #10883

Uh oh!

wolfSSL-Fenrir-bot left a comment

Choose a reason for hiding this comment

Fenrir Automated Review — PR #10883

Uh oh!

wolfSSL-Fenrir-bot left a comment

Choose a reason for hiding this comment

Fenrir Automated Review — PR #10883

Uh oh!

Uh oh!

wolfSSL-Fenrir-bot left a comment

Choose a reason for hiding this comment

Fenrir Automated Review — PR #10883

Uh oh!

night1rider commented Jul 20, 2026

Uh oh!

night1rider commented Jul 23, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

night1rider commented Jul 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

github-actions Bot commented Jul 11, 2026 •

edited

Loading