Skip to content

Commit d59641b

Browse files
pbatardpbatard
committed
Fix the ia32 and x64 DBX timestamps
* Also update the LoongArch64 toolchain to latest and EDK2 to the 202508 stable release (and fix the usual breakage that happens on EDK2 updates, this time for RISCV64...) * Note that we don't update EDK2 to the 202511 stable release *YET* because it removes ARM32 support.
1 parent 0d08601 commit d59641b

File tree

4 files changed

+39
-31
lines changed

4 files changed

+39
-31
lines changed

‎.github/workflows/Linux.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ jobs:
7070
sudo apt-get update
7171
sudo apt-get -y --no-install-recommends install python3-setuptools uuid-dev ${{ matrix.TARGET_PKGS }}
7272
if [[ "${{ matrix.TARGET_ARCH }}" == "LOONGARCH64" ]]; then
73-
curl -L -O https://github.com/loongson/build-tools/releases/download/2024.11.01/x86_64-cross-tools-loongarch64-binutils_2.43.1-gcc_14.2.0-glibc_2.40.tar.xz
74-
tar -xJf x86_64-cross-tools-loongarch64-binutils_2.43.1-gcc_14.2.0-glibc_2.40.tar.xz
73+
curl -L -O https://github.com/loongson/build-tools/releases/download/2025.08.08/x86_64-cross-tools-loongarch64-binutils_2.45-gcc_15.1.0-glibc_2.42.tar.xz
74+
tar -xJf x86_64-cross-tools-loongarch64-binutils_2.45-gcc_15.1.0-glibc_2.42.tar.xz
7575
echo "$PWD/cross-tools/bin" >> "$GITHUB_PATH"
7676
fi
7777
@@ -94,7 +94,7 @@ jobs:
9494
mv Build/${{ env.BUILD_TYPE }}_${{ env.COMPILER }}/${{ matrix.TARGET_ARCH }}/Mosby.efi Mosby_${{ matrix.TARGET_TYPE }}.efi
9595
9696
- name: Upload artifacts
97-
uses: actions/upload-artifact@v4
97+
uses: actions/upload-artifact@v5
9898
with:
9999
name: ${{ matrix.TARGET_TYPE }}
100100
path: ./*.efi
@@ -119,7 +119,7 @@ jobs:
119119
run: echo "version=$(git describe --tags)" >> $GITHUB_OUTPUT
120120

121121
- name: Download artifacts
122-
uses: actions/download-artifact@v4
122+
uses: actions/download-artifact@v5
123123

124124
- name: Create release archive
125125
run: 7z a -tzip -r Mosby_${{ steps.set_version.outputs.version }}.zip README.md ./Mosby.nsh ./*/*.efi

‎OpenSSL-submodule-fixes-for-RISCV64-compilation.patch‎

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From b7f3fefcc4d946c78c2ab0a500e969632e593723 Mon Sep 17 00:00:00 2001
1+
From 44b9d6c118b6dc4d7693c35cb1d193934de20ac3 Mon Sep 17 00:00:00 2001
22
From: Pete Batard <pete@akeo.ie>
3-
Date: Mon, 27 Jan 2025 20:38:04 +0000
3+
Date: Fri, 21 Nov 2025 18:43:36 +0000
44
Subject: [PATCH] OpenSSL submodule fixes for RISCV64 compilation
55

66
---
@@ -9,17 +9,17 @@ Subject: [PATCH] OpenSSL submodule fixes for RISCV64 compilation
99
crypto/ec/ec_ameth.c | 3 ++-
1010
crypto/evp/evp_enc.c | 2 +-
1111
providers/implementations/include/prov/ciphercommon.h | 2 +-
12-
providers/implementations/include/prov/digestcommon.h | 2 +-
12+
providers/implementations/include/prov/digestcommon.h | 4 ++--
1313
providers/implementations/macs/hmac_prov.c | 2 +-
1414
providers/implementations/signature/ecdsa_sig.c | 2 +-
1515
providers/implementations/signature/rsa_sig.c | 2 +-
16-
9 files changed, 10 insertions(+), 9 deletions(-)
16+
9 files changed, 11 insertions(+), 10 deletions(-)
1717

1818
diff --git a/crypto/ec/curve448/curve448.c b/crypto/ec/curve448/curve448.c
19-
index 6928d9693c..7ddd617a73 100644
19+
index 1db78ee5c6..44217c74ac 100644
2020
--- a/crypto/ec/curve448/curve448.c
2121
+++ b/crypto/ec/curve448/curve448.c
22-
@@ -509,7 +509,7 @@ struct smvt_control {
22+
@@ -510,7 +510,7 @@ struct smvt_control {
2323
int power, addend;
2424
};
2525

@@ -29,7 +29,7 @@ index 6928d9693c..7ddd617a73 100644
2929
#else
3030
# define NUMTRAILINGZEROS numtrailingzeros
3131
diff --git a/crypto/ec/curve448/point_448.h b/crypto/ec/curve448/point_448.h
32-
index e67ea68044..72536c2471 100644
32+
index 96a54558d6..dfe01ecaa2 100644
3333
--- a/crypto/ec/curve448/point_448.h
3434
+++ b/crypto/ec/curve448/point_448.h
3535
@@ -181,7 +181,7 @@ static ossl_inline void curve448_scalar_copy(curve448_scalar_t out,
@@ -42,7 +42,7 @@ index e67ea68044..72536c2471 100644
4242

4343
/*
4444
diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
45-
index d4348ff244..cac8672354 100644
45+
index ad28ba6827..ea67f35769 100644
4646
--- a/crypto/ec/ec_ameth.c
4747
+++ b/crypto/ec/ec_ameth.c
4848
@@ -161,12 +161,13 @@ static int eckey_priv_decode_ex(EVP_PKEY *pkey, const PKCS8_PRIV_KEY_INFO *p8,
@@ -61,10 +61,10 @@ index d4348ff244..cac8672354 100644
6161
ERR_raise(ERR_LIB_EC, EC_R_DECODE_ERROR);
6262
return 0;
6363
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
64-
index 4e6f83e3d0..6cac709644 100644
64+
index eee00a0780..37108a6a5c 100644
6565
--- a/crypto/evp/evp_enc.c
6666
+++ b/crypto/evp/evp_enc.c
67-
@@ -1423,7 +1423,7 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in)
67+
@@ -1790,7 +1790,7 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in)
6868

6969
EVP_CIPHER_CTX_reset(out);
7070

@@ -74,10 +74,10 @@ index 4e6f83e3d0..6cac709644 100644
7474

7575
if (in->fetched_cipher != NULL && !EVP_CIPHER_up_ref(in->fetched_cipher)) {
7676
diff --git a/providers/implementations/include/prov/ciphercommon.h b/providers/implementations/include/prov/ciphercommon.h
77-
index aacd49707f..03c25cbb1f 100644
77+
index 46efdc8003..0c54c6e57a 100644
7878
--- a/providers/implementations/include/prov/ciphercommon.h
7979
+++ b/providers/implementations/include/prov/ciphercommon.h
80-
@@ -317,7 +317,7 @@ static void name(PROV_CIPHER_CTX *dst, const PROV_CIPHER_CTX *src) \
80+
@@ -327,7 +327,7 @@ static void name(PROV_CIPHER_CTX *dst, const PROV_CIPHER_CTX *src) \
8181
CTX_TYPE *sctx = (CTX_TYPE *)src; \
8282
CTX_TYPE *dctx = (CTX_TYPE *)dst; \
8383
\
@@ -87,23 +87,31 @@ index aacd49707f..03c25cbb1f 100644
8787
}
8888

8989
diff --git a/providers/implementations/include/prov/digestcommon.h b/providers/implementations/include/prov/digestcommon.h
90-
index abdb8bb2ad..7e299501c4 100644
90+
index 332d473490..d12ce27126 100644
9191
--- a/providers/implementations/include/prov/digestcommon.h
9292
+++ b/providers/implementations/include/prov/digestcommon.h
93-
@@ -67,7 +67,7 @@ static void *name##_dupctx(void *ctx) \
93+
@@ -67,14 +67,14 @@ static void *name##_dupctx(void *ctx) \
9494
CTX *in = (CTX *)ctx; \
9595
CTX *ret = ossl_prov_is_running() ? OPENSSL_malloc(sizeof(*ret)) : NULL; \
9696
if (ret != NULL) \
9797
- *ret = *in; \
9898
+ memcpy(ret, in, sizeof(*ret)); \
9999
return ret; \
100100
} \
101+
static void name##_copyctx(void *voutctx, void *vinctx) \
102+
{ \
103+
CTX *outctx = (CTX *)voutctx; \
104+
CTX *inctx = (CTX *)vinctx; \
105+
- *outctx = *inctx; \
106+
+ memcpy(outctx, inctx, sizeof(CTX)); \
107+
} \
101108
PROV_FUNC_DIGEST_FINAL(name, dgstsize, fin) \
109+
PROV_FUNC_DIGEST_GET_PARAM(name, blksize, dgstsize, flags) \
102110
diff --git a/providers/implementations/macs/hmac_prov.c b/providers/implementations/macs/hmac_prov.c
103-
index 52ebb08b8f..4bfe4ca675 100644
111+
index e9c3087027..d8ca1fb974 100644
104112
--- a/providers/implementations/macs/hmac_prov.c
105113
+++ b/providers/implementations/macs/hmac_prov.c
106-
@@ -112,7 +112,7 @@ static void *hmac_dup(void *vsrc)
114+
@@ -116,7 +116,7 @@ static void *hmac_dup(void *vsrc)
107115
return NULL;
108116

109117
ctx = dst->ctx;
@@ -113,31 +121,31 @@ index 52ebb08b8f..4bfe4ca675 100644
113121
dst->key = NULL;
114122
memset(&dst->digest, 0, sizeof(dst->digest));
115123
diff --git a/providers/implementations/signature/ecdsa_sig.c b/providers/implementations/signature/ecdsa_sig.c
116-
index 865d49d100..472add01f2 100644
124+
index 4018a772ff..bc496ffa35 100644
117125
--- a/providers/implementations/signature/ecdsa_sig.c
118126
+++ b/providers/implementations/signature/ecdsa_sig.c
119-
@@ -399,7 +399,7 @@ static void *ecdsa_dupctx(void *vctx)
127+
@@ -638,7 +638,7 @@ static void *ecdsa_dupctx(void *vctx)
120128
if (dstctx == NULL)
121129
return NULL;
122130

123131
- *dstctx = *srcctx;
124132
+ memcpy(dstctx, srcctx, sizeof(*dstctx));
125133
dstctx->ec = NULL;
126-
dstctx->md = NULL;
127-
dstctx->mdctx = NULL;
134+
dstctx->propq = NULL;
135+
128136
diff --git a/providers/implementations/signature/rsa_sig.c b/providers/implementations/signature/rsa_sig.c
129-
index 919ef17269..540bea8814 100644
137+
index e75b90840b..8e83a7a67c 100644
130138
--- a/providers/implementations/signature/rsa_sig.c
131139
+++ b/providers/implementations/signature/rsa_sig.c
132-
@@ -994,7 +994,7 @@ static void *rsa_dupctx(void *vprsactx)
140+
@@ -1343,7 +1343,7 @@ static void *rsa_dupctx(void *vprsactx)
141+
if (dstctx == NULL)
133142
return NULL;
134-
}
135143

136144
- *dstctx = *srcctx;
137145
+ memcpy(dstctx, srcctx, sizeof(*dstctx));
138146
dstctx->rsa = NULL;
139147
dstctx->md = NULL;
140148
dstctx->mgf1_md = NULL;
141149
--
142-
2.45.2.windows.1
150+
2.52.0.windows.1
143151

‎edk2‎

Submodule edk2 updated 919 files

‎src/data.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7629,7 +7629,7 @@ EFI_STATUS InitializeList(
76297629
List->Entry[List->Size].Attrs = UEFI_VAR_NV_BS_RT_TIMEAUTH;
76307630
List->Entry[List->Size].Path = L"dbx_x64.bin";
76317631
List->Entry[List->Size].Url = "https://github.com/microsoft/secureboot_objects/raw/main/PostSignedObjects/DBX/amd64/DBXUpdate.bin";
7632-
List->Entry[List->Size].Description = "DBX for x86 (64 bit) [2025.06.11]";
7632+
List->Entry[List->Size].Description = "DBX for x86 (64 bit) [2025.10.16]";
76337633
List->Entry[List->Size].Buffer.Data = dbx_x64_bin;
76347634
List->Entry[List->Size].Buffer.Size = dbx_x64_bin_len;
76357635
List->Size++;
@@ -7640,7 +7640,7 @@ EFI_STATUS InitializeList(
76407640
List->Entry[List->Size].Attrs = UEFI_VAR_NV_BS_RT_TIMEAUTH;
76417641
List->Entry[List->Size].Path = L"dbx_ia32.bin";
76427642
List->Entry[List->Size].Url = "https://github.com/microsoft/secureboot_objects/raw/main/PostSignedObjects/DBX/x86/DBXUpdate.bin";
7643-
List->Entry[List->Size].Description = "DBX for x86 (32 bit) [2025.02.24]";
7643+
List->Entry[List->Size].Description = "DBX for x86 (32 bit) [2025.10.16]";
76447644
List->Entry[List->Size].Buffer.Data = dbx_ia32_bin;
76457645
List->Entry[List->Size].Buffer.Size = dbx_ia32_bin_len;
76467646
List->Size++;

0 commit comments

Comments
 (0)