Skip to content

Commit 31eefa6

Browse files
committed
CryptoPkg: Update generated files based on openssl 3.4.1
FIX: tianocore#10664 Signed-off-by: Li Yi <[email protected]>
1 parent 2697a16 commit 31eefa6

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

CryptoPkg/Library/OpensslLib/OpensslGen/AARCH64-GCC/crypto/aes/aesv8-armx.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -2227,7 +2227,7 @@ aes_v8_ctr32_encrypt_blocks_unroll12_eor3:
22272227
ldp d8,d9,[sp, #16]
22282228
ldp d10,d11,[sp, #32]
22292229
ldp d12,d13,[sp, #48]
2230-
ldp d15,d16,[sp, #64]
2230+
ldp d14,d15,[sp, #64]
22312231
ldr x29,[sp],#80
22322232
ret
22332233
.size aes_v8_ctr32_encrypt_blocks_unroll12_eor3,.-aes_v8_ctr32_encrypt_blocks_unroll12_eor3

CryptoPkg/Library/OpensslLib/OpensslGen/AARCH64-GCC/crypto/bn/armv8-mont.S

+2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ bn_mul_mont:
1616
cmp x5,#32
1717
b.le .Lscalar_impl
1818
#ifndef __KERNEL__
19+
#ifndef __AARCH64EB__
1920
adrp x17,OPENSSL_armv8_rsa_neonized
2021
ldr w17,[x17,#:lo12:OPENSSL_armv8_rsa_neonized]
2122
cbnz w17, bn_mul8x_mont_neon
2223
#endif
24+
#endif
2325

2426
.Lscalar_impl:
2527
tst x5,#7

CryptoPkg/Library/OpensslLib/OpensslGen/include/openssl/opensslv.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extern "C" {
2929
*/
3030
# define OPENSSL_VERSION_MAJOR 3
3131
# define OPENSSL_VERSION_MINOR 4
32-
# define OPENSSL_VERSION_PATCH 0
32+
# define OPENSSL_VERSION_PATCH 1
3333

3434
/*
3535
* Additional version information
@@ -74,21 +74,21 @@ extern "C" {
7474
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
7575
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
7676
*/
77-
# define OPENSSL_VERSION_STR "3.4.0"
78-
# define OPENSSL_FULL_VERSION_STR "3.4.0"
77+
# define OPENSSL_VERSION_STR "3.4.1"
78+
# define OPENSSL_FULL_VERSION_STR "3.4.1"
7979

8080
/*
8181
* SECTION 3: ADDITIONAL METADATA
8282
*
8383
* These strings are defined separately to allow them to be parsable.
8484
*/
85-
# define OPENSSL_RELEASE_DATE "22 Oct 2024"
85+
# define OPENSSL_RELEASE_DATE "11 Feb 2025"
8686

8787
/*
8888
* SECTION 4: BACKWARD COMPATIBILITY
8989
*/
9090

91-
# define OPENSSL_VERSION_TEXT "OpenSSL 3.4.0 22 Oct 2024"
91+
# define OPENSSL_VERSION_TEXT "OpenSSL 3.4.1 11 Feb 2025"
9292

9393
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
9494
# ifdef OPENSSL_VERSION_PRE_RELEASE

CryptoPkg/Library/OpensslLib/OpensslGen/include/openssl/x509.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -1098,9 +1098,8 @@ X509_EXTENSION *X509v3_get_ext(const STACK_OF(X509_EXTENSION) *x, int loc);
10981098
X509_EXTENSION *X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc);
10991099
STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
11001100
X509_EXTENSION *ex, int loc);
1101-
STACK_OF(X509_EXTENSION)
1102-
*X509v3_add_extensions(STACK_OF(X509_EXTENSION) **target,
1103-
const STACK_OF(X509_EXTENSION) *exts);
1101+
STACK_OF(X509_EXTENSION) *X509v3_add_extensions(STACK_OF(X509_EXTENSION) **target,
1102+
const STACK_OF(X509_EXTENSION) *exts);
11041103

11051104
int X509_get_ext_count(const X509 *x);
11061105
int X509_get_ext_by_NID(const X509 *x, int nid, int lastpos);

0 commit comments

Comments
 (0)