Skip to content

Commit 6d306a9

Browse files
committed
Track the wolfSSL dilithium.c to wc_mldsa.c rename and drop a stale java import
1 parent 77c88d4 commit 6d306a9

3 files changed

Lines changed: 13 additions & 4 deletions

File tree

.github/workflows/cross-build.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,8 +418,18 @@ jobs:
418418
git clone -q --depth 1 https://github.com/nxp-mcuxpresso/mcux-sdk /tmp/sdk
419419
git clone -q --depth 1 https://github.com/nxp-mcuxpresso/CMSIS_5 /tmp/cmsis
420420
cp -r /tmp/cmsis/CMSIS /tmp/sdk/CMSIS
421-
test -d /tmp/sdk/devices/MIMXRT1062/drivers || { echo "FAIL: SDK layout unexpected"; exit 1; }
422-
test -d /tmp/sdk/CMSIS/Core/Include || { echo "FAIL: CMSIS missing"; exit 1; }
421+
# The Builder zip nests debug_console/str under the device dir; the
422+
# public repo keeps them top-level. Makefile expects the Builder shape.
423+
mkdir -p /tmp/sdk/devices/MIMXRT1062/utilities
424+
cp -r /tmp/sdk/utilities/debug_console /tmp/sdk/devices/MIMXRT1062/utilities/
425+
cp -r /tmp/sdk/utilities/str /tmp/sdk/devices/MIMXRT1062/utilities/
426+
for d in devices/MIMXRT1062/drivers devices/MIMXRT1062/utilities/debug_console \
427+
devices/MIMXRT1062/utilities/str components/serial_manager \
428+
components/uart CMSIS/Core/Include; do
429+
test -d "/tmp/sdk/$d" || { echo "FAIL: SDK missing $d"; exit 1; }
430+
done
431+
test -f /tmp/sdk/devices/MIMXRT1062/utilities/debug_console/fsl_debug_console.h \
432+
|| { echo "FAIL: fsl_debug_console.h not where the Makefile looks"; exit 1; }
423433
424434
- name: Build
425435
run: |

java/https-url/URLClient.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import javax.net.ssl.KeyManagerFactory;
5050
import javax.net.ssl.TrustManagerFactory;
5151

52-
import com.wolfssl.provider.jsse.WolfSSLDebug;
5352
import com.wolfssl.provider.jsse.WolfSSLProvider;
5453
import com.wolfssl.WolfSSL;
5554

uefi-library/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ OBJS_WOLFCRYPT := \
7272
$(WOLFSSL_PATH)/wolfcrypt/src/cpuid.o \
7373
$(WOLFSSL_PATH)/wolfcrypt/src/memory.o \
7474
$(WOLFSSL_PATH)/wolfcrypt/src/rsa.o \
75-
$(WOLFSSL_PATH)/wolfcrypt/src/dilithium.o \
75+
$(WOLFSSL_PATH)/wolfcrypt/src/wc_mldsa.o \
7676
$(WOLFSSL_PATH)/wolfcrypt/src/falcon.o \
7777
$(WOLFSSL_PATH)/wolfcrypt/src/dh.o \
7878
$(WOLFSSL_PATH)/wolfcrypt/src/kdf.o \

0 commit comments

Comments
 (0)