Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update to openssl-3.4.x #6184

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
Draft

update to openssl-3.4.x #6184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1d0784c
openssl: update submodule to 3.4.0
kraxel May 22, 2024
be2f123
openssl: update generated files
kraxel May 22, 2024
32bbb86
CryptoPkg: CI: update OpensslGen file list
kraxel Jul 3, 2024
baa381c
openssl: adapt stubs to openssl 3.2.x
kraxel May 22, 2024
036a20c
openssl: add more stubs for openssl 3.2.x
kraxel May 22, 2024
58f3bef
openssl: turn off some ws2019 warnings.
kraxel Jul 17, 2024
9a00e48
CryptoPkg: add openssl/providers/fips/include to includes
kraxel Sep 9, 2024
b8e2850
CryptoPkg/BaseCryptLib: add next parameter to SHA3_squeeze
kraxel Sep 9, 2024
871516d
disable vs warning 4189 (local variable is initialized but not refere…
kraxel Sep 10, 2024
8928944
CryptoPkg: gcc needs 4k section alignment too
kraxel Sep 10, 2024
3026d00
CryptoPkg: CI: update OpensslGen file list
kraxel Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CryptoPkg/CryptoPkg.ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,21 @@
# options defined in .pytool/Plugin/UncrustifyCheck
"UncrustifyCheck": {
"IgnoreFiles": [
"Library/OpensslLib/OpensslGen/crypto/params_idx.c",
"Library/OpensslLib/OpensslGen/include/crypto/bn_conf.h",
"Library/OpensslLib/OpensslGen/include/crypto/dso_conf.h",
"Library/OpensslLib/OpensslGen/include/internal/param_names.h",
"Library/OpensslLib/OpensslGen/include/openssl/asn1.h",
"Library/OpensslLib/OpensslGen/include/openssl/asn1t.h",
"Library/OpensslLib/OpensslGen/include/openssl/bio.h",
"Library/OpensslLib/OpensslGen/include/openssl/cmp.h",
"Library/OpensslLib/OpensslGen/include/openssl/cms.h",
"Library/OpensslLib/OpensslGen/include/openssl/comp.h",
"Library/OpensslLib/OpensslGen/include/openssl/conf.h",
"Library/OpensslLib/OpensslGen/include/openssl/configuration-ec.h",
"Library/OpensslLib/OpensslGen/include/openssl/configuration-noec.h",
"Library/OpensslLib/OpensslGen/include/openssl/configuration.h",
"Library/OpensslLib/OpensslGen/include/openssl/core_names.h",
"Library/OpensslLib/OpensslGen/include/openssl/crmf.h",
"Library/OpensslLib/OpensslGen/include/openssl/crypto.h",
"Library/OpensslLib/OpensslGen/include/openssl/ct.h",
Expand All @@ -133,6 +137,7 @@
"Library/OpensslLib/OpensslGen/include/openssl/ui.h",
"Library/OpensslLib/OpensslGen/include/openssl/x509.h",
"Library/OpensslLib/OpensslGen/include/openssl/x509v3.h",
"Library/OpensslLib/OpensslGen/include/openssl/x509_acert.h",
"Library/OpensslLib/OpensslGen/include/openssl/x509_vfy.h",
"Library/OpensslLib/OpensslGen/providers/common/der/der_digests_gen.c",
"Library/OpensslLib/OpensslGen/providers/common/der/der_ecx_gen.c",
Expand Down
1 change: 1 addition & 0 deletions CryptoPkg/CryptoPkg.dec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
Library/OpensslLib/openssl
Library/OpensslLib/openssl/include
Library/OpensslLib/openssl/providers/common/include
Library/OpensslLib/openssl/providers/fips/include
Library/OpensslLib/openssl/providers/implementations/include
Library/OpensslLib/OpensslGen/include
Library/OpensslLib/OpensslGen/providers/common/include
Expand Down
3 changes: 3 additions & 0 deletions CryptoPkg/CryptoPkg.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,7 @@
<BuildOptions>
MSFT:*_*_IA32_DLINK_FLAGS = /ALIGN:4096
MSFT:*_*_X64_DLINK_FLAGS = /ALIGN:4096
GCC:*_*_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x1000
}
!endif

Expand Down Expand Up @@ -543,6 +544,7 @@
<BuildOptions>
MSFT:*_*_IA32_DLINK_FLAGS = /ALIGN:4096
MSFT:*_*_X64_DLINK_FLAGS = /ALIGN:4096
GCC:*_*_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x1000
}
#
# CryptoSmm with OpensslLib instance with no SSL or EC services
Expand Down Expand Up @@ -596,6 +598,7 @@
<BuildOptions>
MSFT:*_*_IA32_DLINK_FLAGS = /ALIGN:4096
MSFT:*_*_X64_DLINK_FLAGS = /ALIGN:4096
GCC:*_*_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x1000
}
#
# CryptoStandaloneMm with OpensslLib instance with no SSL or EC services
Expand Down
3 changes: 2 additions & 1 deletion CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ SHA3_squeeze (
uint64_t A[5][5],
unsigned char *out,
size_t len,
size_t r
size_t r,
int next
);

/**
Expand Down
2 changes: 1 addition & 1 deletion CryptoPkg/Library/BaseCryptLib/Hash/CryptSha3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ Sha3Final (

(void)SHA3_absorb (Context->A, Context->buf, BlockSize, BlockSize);

SHA3_squeeze (Context->A, MessageDigest, Context->md_size, BlockSize);
SHA3_squeeze (Context->A, MessageDigest, Context->md_size, BlockSize, 0);

return 1;
}
Loading