CI: fix the macOS and ProxSpace builds, build in the WSL file system
mfulc_des_brute added the Homebrew openssl@3.6 include directory, which the macOS runners no longer have, and -Wmissing-include-dirs under -Werror stopped the build. It now uses brew --prefix openssl, as #3734 did for mfd_aes_brute. Since MSYS2 filesystem 2026.10.18 /etc/profile runs post-install scripts on the first start only, so ProxSpace never installed its packages and the build found no arm-none-eabi-gcc. The workflow now runs ProxSpace's setup script when setup\installed is missing. The third mfulc_des_brute test in pm3_tests.sh is now labelled 3/3. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e99dccf43a
commit
8953c8d88d
4 files changed
+28
-16
No files matched your search
@@ -15,8 +15,9 @@ endif
|
||||
|
||||
# OS X needs linking to openssl
|
||||
ifeq ($(USE_BREW),1)
|
||||
MYCFLAGS += -I$(BREW_PREFIX)/opt/openssl@3/include -I$(BREW_PREFIX)/opt/openssl@3.6/include
|
||||
MYLDFLAGS += -L$(BREW_PREFIX)/opt/openssl@3/lib -L$(BREW_PREFIX)/opt/openssl@3.6/lib
|
||||
OPENSSL_PREFIX := $(shell brew --prefix openssl)
|
||||
MYCFLAGS += -I$(OPENSSL_PREFIX)/include
|
||||
MYLDFLAGS += -L$(OPENSSL_PREFIX)/lib
|
||||
endif
|
||||
|
||||
ifeq ($(USE_MACPORTS),1)
|
||||
|
||||
+1
-1
@@ -371,7 +371,7 @@ while true; do
|
||||
# ULCG
|
||||
if ! CheckExecute "mfulc_des_brute test 2/3" "$MFULCDESBRUTEBIN -c 49C1603621CCAA72 8122262EF5FA8DEB 48444C4A4044524200000000544E5846 3 4" "48444C4A40445242204E4042544E5846"; then break; fi
|
||||
# Reader RndB nonce key recovery
|
||||
if ! CheckExecute "mfulc_des_brute test 2/3" "$MFULCDESBRUTEBIN -r EC9C5CF763244367 2283BFE8DEBE1780922327794D0706EF 48444C4A4044524200000000544E5846 3 4" "48444C4A40445242204E4042544E5846"; then break; fi
|
||||
if ! CheckExecute "mfulc_des_brute test 3/3" "$MFULCDESBRUTEBIN -r EC9C5CF763244367 2283BFE8DEBE1780922327794D0706EF 48444C4A4044524200000000544E5846 3 4" "48444C4A40445242204E4042544E5846"; then break; fi
|
||||
fi
|
||||
if $TESTALL || $TESTCRYPTORF; then
|
||||
echo -e "\n${C_BLUE}Testing CryptoRF sma:${C_NC} ${CRYPTRFBRUTEBIN:=./tools/cryptorf/sma} ${CRYPTRF_MULTI_BRUTEBIN:=./tools/cryptorf/sma_multi}"
|
||||
|
||||
Reference in new issue
Block a user