mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2026-07-05 13:30:48 +02:00
Add STSAFE A120 CI support
Adds our STSAFE A120 simulator to the CI, adds STSAFE to configure.ac and fix missing required header.
This commit is contained in:
Andrew Hutchings
@@ -0,0 +1,96 @@
|
||||
name: STSAFE-A120 simulator test
|
||||
|
||||
# START OF COMMON SECTION
|
||||
on:
|
||||
push:
|
||||
branches: [ 'master', 'main', 'release/**' ]
|
||||
pull_request:
|
||||
branches: [ '*' ]
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
# END OF COMMON SECTION
|
||||
|
||||
# Build the STSAFE-A120 software simulator (https://github.com/wolfSSL/simulators,
|
||||
# STSAFEA120Sim/ subdirectory), build wolfSSL against STMicro's STSELib +
|
||||
# simulator bridge, and run the wolfCrypt STSAFE-A120 test binary against the
|
||||
# simulator TCP server.
|
||||
#
|
||||
# The simulator's own Dockerfile (Dockerfile.wolfcrypt) clones wolfSSL master
|
||||
# and applies two sed patches to it. Both patches are now upstreamed in
|
||||
# wolfSSL itself (the include.am stsafe.c entry, and the
|
||||
# stse_platform_generic.h include order in stsafe.c), so we:
|
||||
# 1. COPY the PR checkout instead of cloning master.
|
||||
# 2. Strip the now-redundant sed RUN block.
|
||||
# 3. Switch the configure invocation from a raw -DWOLFSSL_STSAFEA120
|
||||
# CFLAG to the new --enable-stsafe=a120 option.
|
||||
|
||||
env:
|
||||
SIMULATORS_REF: 7e4a50ac3316680c523ec2f66711ea8403c94468
|
||||
|
||||
jobs:
|
||||
stsafe_a120_sim:
|
||||
name: wolfCrypt against STSAFE-A120 simulator
|
||||
if: github.repository_owner == 'wolfssl'
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 30
|
||||
steps:
|
||||
- name: Checkout wolfSSL (PR source)
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
path: wolfssl-src
|
||||
|
||||
- name: Clone STSAFE-A120 simulator
|
||||
run: |
|
||||
git clone https://github.com/wolfSSL/simulators simulators
|
||||
cd simulators && git checkout "$SIMULATORS_REF"
|
||||
|
||||
- name: Stage PR wolfSSL into simulator build context
|
||||
run: mv wolfssl-src simulators/STSAFEA120Sim/wolfssl
|
||||
|
||||
- name: Patch Dockerfile to use PR wolfSSL and the upstreamed STSAFE build flags
|
||||
working-directory: simulators/STSAFEA120Sim
|
||||
run: |
|
||||
# 1. Replace the upstream master clone with a COPY of the PR source.
|
||||
sed -i 's|^RUN git clone --branch \${WOLFSSL_REF} --depth 1 \\$|COPY wolfssl /app/wolfssl|' Dockerfile.wolfcrypt
|
||||
# The COPY directive above is one line, so drop the now-stranded
|
||||
# `https://github.com/wolfSSL/wolfssl.git /app/wolfssl` continuation
|
||||
# line that followed the original `git clone --depth 1 \` line.
|
||||
sed -i '\|^ https://github.com/wolfSSL/wolfssl.git /app/wolfssl$|d' Dockerfile.wolfcrypt
|
||||
# Fail fast if the pattern drifted upstream -- better a clear error
|
||||
# than a CI run that silently tests master.
|
||||
grep -q '^COPY wolfssl /app/wolfssl$' Dockerfile.wolfcrypt
|
||||
! grep -q 'git clone .*wolfssl\.git' Dockerfile.wolfcrypt
|
||||
|
||||
# 2. Neutralise the sed-patch RUN block: the patches it applies
|
||||
# (adding stsafe.c to include.am, prepending
|
||||
# stse_platform_generic.h to stsafe.c) are now upstream and
|
||||
# rerunning them would produce duplicate entries.
|
||||
sed -i '/^RUN sed -i \\$/,/^ head -2 \/app\/wolfssl\/wolfcrypt\/src\/port\/st\/stsafe\.c$/c\RUN true' Dockerfile.wolfcrypt
|
||||
! grep -q 'sed -i .*include.am' Dockerfile.wolfcrypt
|
||||
! grep -q 'sed -i .*port/st/stsafe.c' Dockerfile.wolfcrypt
|
||||
|
||||
# 3. Switch the wolfSSL configure invocation to the new
|
||||
# --enable-stsafe=a120 option, and drop the now-redundant raw
|
||||
# -DWOLFSSL_STSAFEA120 from CFLAGS.
|
||||
sed -i 's|^ --disable-examples \\$| --disable-examples \\\n --enable-stsafe=a120 \\|' Dockerfile.wolfcrypt
|
||||
sed -i 's|-DWOLFSSL_STSAFEA120 ||' Dockerfile.wolfcrypt
|
||||
grep -q -- '--enable-stsafe=a120' Dockerfile.wolfcrypt
|
||||
! grep -q -- '-DWOLFSSL_STSAFEA120' Dockerfile.wolfcrypt
|
||||
|
||||
- uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Build wolfCrypt-STSAFE-A120 test image
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: simulators/STSAFEA120Sim
|
||||
file: simulators/STSAFEA120Sim/Dockerfile.wolfcrypt
|
||||
push: false
|
||||
load: true
|
||||
tags: wolfssl-stsafe-a120-sim:ci
|
||||
cache-from: type=gha
|
||||
cache-to: type=gha,mode=max
|
||||
|
||||
- name: Run wolfCrypt tests against simulator
|
||||
run: docker run --rm wolfssl-stsafe-a120-sim:ci
|
||||
@@ -3050,6 +3050,25 @@ AC_ARG_WITH([tropic01],
|
||||
)
|
||||
|
||||
|
||||
# STMicro STSAFE-A100 / STSAFE-A120
|
||||
# Example: "./configure --enable-stsafe=a120"
|
||||
ENABLED_STSAFE="no"
|
||||
AC_ARG_ENABLE([stsafe],
|
||||
[AS_HELP_STRING([--enable-stsafe@<:@=a100|a120@:>@],
|
||||
[Enable STMicro STSAFE secure-element support. Variant selects the SDK:
|
||||
a100 (legacy STSAFE-A1xx SDK, default) or a120 (STSELib).])],
|
||||
[ ENABLED_STSAFE=$enableval ],
|
||||
[ ENABLED_STSAFE=no ])
|
||||
|
||||
case "$ENABLED_STSAFE" in
|
||||
no) ;;
|
||||
yes|a100) AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_STSAFE -DWOLFSSL_STSAFEA100"
|
||||
ENABLED_STSAFE="a100" ;;
|
||||
a120) AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_STSAFE -DWOLFSSL_STSAFEA120" ;;
|
||||
*) AC_MSG_ERROR([Invalid --enable-stsafe value '$ENABLED_STSAFE'; use a100 or a120]) ;;
|
||||
esac
|
||||
|
||||
|
||||
# NXP SE050
|
||||
# Example: "./configure --with-se050=/home/pi/simw_top"
|
||||
ENABLED_SE050="no"
|
||||
@@ -12112,6 +12131,7 @@ AM_CONDITIONAL([BUILD_QNXCAAM],[test "x$ENABLED_CAAM_QNX" = "xyes"])
|
||||
AM_CONDITIONAL([BUILD_IOTSAFE],[test "x$ENABLED_IOTSAFE" = "xyes"])
|
||||
AM_CONDITIONAL([BUILD_IOTSAFE_HWRNG],[test "x$ENABLED_IOTSAFE_HWRNG" = "xyes"])
|
||||
AM_CONDITIONAL([BUILD_SE050],[test "x$ENABLED_SE050" = "xyes"])
|
||||
AM_CONDITIONAL([BUILD_STSAFE],[test "x$ENABLED_STSAFE" != "xno"])
|
||||
AM_CONDITIONAL([BUILD_TROPIC01],[test "x$ENABLED_TROPIC01" = "xyes"])
|
||||
AM_CONDITIONAL([BUILD_KDF],[test "x$ENABLED_KDF" = "xyes"])
|
||||
AM_CONDITIONAL([BUILD_HMAC],[test "x$ENABLED_HMAC" = "xyes"])
|
||||
@@ -12681,6 +12701,7 @@ echo " * i.MX CAAM: $ENABLED_CAAM"
|
||||
echo " * IoT-Safe: $ENABLED_IOTSAFE"
|
||||
echo " * IoT-Safe HWRNG: $ENABLED_IOTSAFE_HWRNG"
|
||||
echo " * NXP SE050: $ENABLED_SE050"
|
||||
echo " * STMicro STSAFE: $ENABLED_STSAFE"
|
||||
echo " * TROPIC01: $ENABLED_TROPIC01"
|
||||
echo " * Maxim Integrated MAXQ10XX: $ENABLED_MAXQ10XX"
|
||||
echo " * PSA: $ENABLED_PSA"
|
||||
|
||||
@@ -100,7 +100,6 @@ EXTRA_DIST += wolfcrypt/src/port/ti/ti-aes.c \
|
||||
wolfcrypt/src/port/silabs/silabs_random.c \
|
||||
wolfcrypt/src/port/silabs/README.md \
|
||||
wolfcrypt/src/port/st/stm32.c \
|
||||
wolfcrypt/src/port/st/stsafe.c \
|
||||
wolfcrypt/src/port/st/README.md \
|
||||
wolfcrypt/src/port/st/STM32MP13.md \
|
||||
wolfcrypt/src/port/st/STM32MP25.md \
|
||||
@@ -235,6 +234,10 @@ if BUILD_SE050
|
||||
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/nxp/se050_port.c
|
||||
endif
|
||||
|
||||
if BUILD_STSAFE
|
||||
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/st/stsafe.c
|
||||
endif
|
||||
|
||||
if BUILD_TROPIC01
|
||||
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/tropicsquare/tropic01.c
|
||||
endif
|
||||
|
||||
@@ -53,6 +53,7 @@
|
||||
|
||||
#ifdef WOLFSSL_STSAFEA120
|
||||
/* STSELib includes for A120 */
|
||||
#include "stse_platform_generic.h"
|
||||
#include "stselib.h"
|
||||
#else /* WOLFSSL_STSAFEA100 */
|
||||
/* Legacy STSAFE-A1xx SDK includes */
|
||||
|
||||
Reference in New Issue
Block a user