diff --git a/Frameworks/OpenSSL.xcframework/Info.plist b/Frameworks/OpenSSL.xcframework/Info.plist
index b76ed69d..85e6daa0 100644
--- a/Frameworks/OpenSSL.xcframework/Info.plist
+++ b/Frameworks/OpenSSL.xcframework/Info.plist
@@ -6,23 +6,26 @@
BinaryPath
- OpenSSL.framework/OpenSSL
+ OpenSSL.framework/Versions/A/OpenSSL
LibraryIdentifier
- xros-arm64
+ ios-arm64_x86_64-maccatalyst
LibraryPath
OpenSSL.framework
SupportedArchitectures
arm64
+ x86_64
SupportedPlatform
- xros
+ ios
+ SupportedPlatformVariant
+ maccatalyst
BinaryPath
- OpenSSL.framework/Versions/A/OpenSSL
+ OpenSSL.framework/OpenSSL
LibraryIdentifier
- ios-arm64_x86_64-maccatalyst
+ ios-arm64_x86_64-simulator
LibraryPath
OpenSSL.framework
SupportedArchitectures
@@ -33,27 +36,29 @@
SupportedPlatform
ios
SupportedPlatformVariant
- maccatalyst
+ simulator
BinaryPath
OpenSSL.framework/OpenSSL
LibraryIdentifier
- tvos-arm64
+ watchos-arm64_arm64_32_armv7k
LibraryPath
OpenSSL.framework
SupportedArchitectures
arm64
+ arm64_32
+ armv7k
SupportedPlatform
- tvos
+ watchos
BinaryPath
- OpenSSL.framework/OpenSSL
+ OpenSSL.framework/Versions/A/OpenSSL
LibraryIdentifier
- watchos-arm64_x86_64-simulator
+ macos-arm64_x86_64
LibraryPath
OpenSSL.framework
SupportedArchitectures
@@ -62,94 +67,89 @@
x86_64
SupportedPlatform
- watchos
- SupportedPlatformVariant
- simulator
+ macos
BinaryPath
OpenSSL.framework/OpenSSL
LibraryIdentifier
- tvos-arm64_x86_64-simulator
+ tvos-arm64
LibraryPath
OpenSSL.framework
SupportedArchitectures
arm64
- x86_64
SupportedPlatform
tvos
- SupportedPlatformVariant
- simulator
BinaryPath
OpenSSL.framework/OpenSSL
LibraryIdentifier
- xros-arm64_x86_64-simulator
+ xros-arm64
LibraryPath
OpenSSL.framework
SupportedArchitectures
arm64
- x86_64
SupportedPlatform
xros
- SupportedPlatformVariant
- simulator
BinaryPath
OpenSSL.framework/OpenSSL
LibraryIdentifier
- watchos-arm64_arm64_32_armv7k
+ xros-arm64_x86_64-simulator
LibraryPath
OpenSSL.framework
SupportedArchitectures
arm64
- arm64_32
- armv7k
+ x86_64
SupportedPlatform
- watchos
+ xros
+ SupportedPlatformVariant
+ simulator
BinaryPath
OpenSSL.framework/OpenSSL
LibraryIdentifier
- ios-arm64
+ tvos-arm64_x86_64-simulator
LibraryPath
OpenSSL.framework
SupportedArchitectures
arm64
+ x86_64
SupportedPlatform
- ios
+ tvos
+ SupportedPlatformVariant
+ simulator
BinaryPath
- OpenSSL.framework/Versions/A/OpenSSL
+ OpenSSL.framework/OpenSSL
LibraryIdentifier
- macos-arm64_x86_64
+ ios-arm64
LibraryPath
OpenSSL.framework
SupportedArchitectures
arm64
- x86_64
SupportedPlatform
- macos
+ ios
BinaryPath
OpenSSL.framework/OpenSSL
LibraryIdentifier
- ios-arm64_x86_64-simulator
+ watchos-arm64_x86_64-simulator
LibraryPath
OpenSSL.framework
SupportedArchitectures
@@ -158,7 +158,7 @@
x86_64
SupportedPlatform
- ios
+ watchos
SupportedPlatformVariant
simulator
diff --git a/Frameworks/OpenSSL.xcframework/_CodeSignature/CodeDirectory b/Frameworks/OpenSSL.xcframework/_CodeSignature/CodeDirectory
index 2e223e3b..7ff4380b 100644
Binary files a/Frameworks/OpenSSL.xcframework/_CodeSignature/CodeDirectory and b/Frameworks/OpenSSL.xcframework/_CodeSignature/CodeDirectory differ
diff --git a/Frameworks/OpenSSL.xcframework/_CodeSignature/CodeRequirements-1 b/Frameworks/OpenSSL.xcframework/_CodeSignature/CodeRequirements-1
index 8b80b247..9c9b2984 100644
Binary files a/Frameworks/OpenSSL.xcframework/_CodeSignature/CodeRequirements-1 and b/Frameworks/OpenSSL.xcframework/_CodeSignature/CodeRequirements-1 differ
diff --git a/Frameworks/OpenSSL.xcframework/_CodeSignature/CodeResources b/Frameworks/OpenSSL.xcframework/_CodeSignature/CodeResources
index 468a3ade..01d9ec8e 100644
--- a/Frameworks/OpenSSL.xcframework/_CodeSignature/CodeResources
+++ b/Frameworks/OpenSSL.xcframework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
ios-arm64/OpenSSL.framework/Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
ios-arm64/OpenSSL.framework/Headers/asn1t.h
@@ -34,7 +34,7 @@
ios-arm64/OpenSSL.framework/Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
ios-arm64/OpenSSL.framework/Headers/bioerr.h
@@ -74,7 +74,7 @@
ios-arm64/OpenSSL.framework/Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
ios-arm64/OpenSSL.framework/Headers/cmp_util.h
@@ -82,7 +82,7 @@
ios-arm64/OpenSSL.framework/Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
ios-arm64/OpenSSL.framework/Headers/cms.h
@@ -102,7 +102,7 @@
ios-arm64/OpenSSL.framework/Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
ios-arm64/OpenSSL.framework/Headers/conf_api.h
@@ -114,7 +114,7 @@
ios-arm64/OpenSSL.framework/Headers/configuration.h
- ia9Lq9Ma5Kl0sdwkNFmHsS3OUkU=
+ MFiooVP1OE4028WfQZREAH2Ma64=
ios-arm64/OpenSSL.framework/Headers/conftypes.h
@@ -126,11 +126,11 @@
ios-arm64/OpenSSL.framework/Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
ios-arm64/OpenSSL.framework/Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
ios-arm64/OpenSSL.framework/Headers/core_object.h
@@ -178,7 +178,7 @@
ios-arm64/OpenSSL.framework/Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
ios-arm64/OpenSSL.framework/Headers/dherr.h
@@ -242,7 +242,7 @@
ios-arm64/OpenSSL.framework/Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
ios-arm64/OpenSSL.framework/Headers/ess.h
@@ -254,7 +254,7 @@
ios-arm64/OpenSSL.framework/Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
ios-arm64/OpenSSL.framework/Headers/evperr.h
@@ -274,15 +274,15 @@
ios-arm64/OpenSSL.framework/Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
ios-arm64/OpenSSL.framework/Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
ios-arm64/OpenSSL.framework/Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
ios-arm64/OpenSSL.framework/Headers/idea.h
@@ -298,7 +298,7 @@
ios-arm64/OpenSSL.framework/Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
ios-arm64/OpenSSL.framework/Headers/macros.h
@@ -326,7 +326,7 @@
ios-arm64/OpenSSL.framework/Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
ios-arm64/OpenSSL.framework/Headers/objects.h
@@ -350,7 +350,7 @@
ios-arm64/OpenSSL.framework/Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
ios-arm64/OpenSSL.framework/Headers/ossl_typ.h
@@ -386,7 +386,7 @@
ios-arm64/OpenSSL.framework/Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
ios-arm64/OpenSSL.framework/Headers/pkcs7err.h
@@ -406,7 +406,7 @@
ios-arm64/OpenSSL.framework/Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
ios-arm64/OpenSSL.framework/Headers/rand.h
@@ -450,7 +450,7 @@
ios-arm64/OpenSSL.framework/Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
ios-arm64/OpenSSL.framework/Headers/sha.h
@@ -470,7 +470,7 @@
ios-arm64/OpenSSL.framework/Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
ios-arm64/OpenSSL.framework/Headers/ssl2.h
@@ -482,11 +482,11 @@
ios-arm64/OpenSSL.framework/Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
ios-arm64/OpenSSL.framework/Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
ios-arm64/OpenSSL.framework/Headers/stack.h
@@ -550,7 +550,7 @@
ios-arm64/OpenSSL.framework/Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
ios-arm64/OpenSSL.framework/Headers/x509err.h
@@ -566,7 +566,7 @@
ios-arm64/OpenSSL.framework/Info.plist
- QrYuUiaf0eAsvjMGE/3sfZCnj4w=
+ 0M5H0ChbB+HbzSq0fxnVTEuStwM=
ios-arm64/OpenSSL.framework/Modules/module.modulemap
@@ -574,7 +574,7 @@
ios-arm64/OpenSSL.framework/OpenSSL
- 7JonS9XM9veasPdXQEhq+nihrRY=
+ W7uFmy9Ecf9hCnYNZIV8EryPx9A=
ios-arm64/OpenSSL.framework/PrivacyInfo.xcprivacy
@@ -582,7 +582,7 @@
ios-arm64/OpenSSL.framework/_CodeSignature/CodeResources
- fC3oucFnqWZPqNAJ10CQhnPJk8Y=
+ 8WzMZW73b2KvTo5pjRehz1O5DFY=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/OpenSSL.h
@@ -598,7 +598,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/asn1t.h
@@ -614,7 +614,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/bioerr.h
@@ -654,7 +654,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/cmp_util.h
@@ -662,7 +662,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/cms.h
@@ -682,7 +682,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/conf_api.h
@@ -694,7 +694,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/configuration.h
- lScZfdfcK3XXRdUgxXzIzzZ9CoM=
+ i+9GbPbFWiftInpFiRJ9aEvJmFk=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/conftypes.h
@@ -706,11 +706,11 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/core_object.h
@@ -758,7 +758,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/dherr.h
@@ -822,7 +822,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/ess.h
@@ -834,7 +834,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/evperr.h
@@ -854,15 +854,15 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/idea.h
@@ -878,7 +878,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/macros.h
@@ -906,7 +906,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/objects.h
@@ -930,7 +930,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/ossl_typ.h
@@ -966,7 +966,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/pkcs7err.h
@@ -986,7 +986,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/rand.h
@@ -1030,7 +1030,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/sha.h
@@ -1050,7 +1050,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/ssl2.h
@@ -1062,11 +1062,11 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/stack.h
@@ -1130,7 +1130,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/x509err.h
@@ -1150,11 +1150,11 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/OpenSSL
- OtyS1Dz6HLbi3iD9en5zLUCY1Cs=
+ GWxse/66X5T7RNWVAVxlaWkLGgg=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Resources/Info.plist
- locKjucac2EJ89FRFaQ2fAquWYc=
+ 5W0vEiZk7ITLhx3QF5fsQmDSSNc=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Resources/PrivacyInfo.xcprivacy
@@ -1162,7 +1162,7 @@
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources
- hrSqgBpvYsXxI967h50+QSo7A7w=
+ 1AL6uDYUrUO/++r9FvoxPoZNW+c=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/OpenSSL.h
@@ -1178,7 +1178,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1t.h
@@ -1194,7 +1194,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/bioerr.h
@@ -1234,7 +1234,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp_util.h
@@ -1242,7 +1242,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/cms.h
@@ -1262,7 +1262,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf_api.h
@@ -1274,7 +1274,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h
- ia9Lq9Ma5Kl0sdwkNFmHsS3OUkU=
+ MFiooVP1OE4028WfQZREAH2Ma64=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/conftypes.h
@@ -1286,11 +1286,11 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_object.h
@@ -1338,7 +1338,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/dherr.h
@@ -1402,7 +1402,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/ess.h
@@ -1414,7 +1414,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/evperr.h
@@ -1434,15 +1434,15 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/idea.h
@@ -1458,7 +1458,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/macros.h
@@ -1486,7 +1486,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/objects.h
@@ -1510,7 +1510,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/ossl_typ.h
@@ -1546,7 +1546,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7err.h
@@ -1566,7 +1566,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/rand.h
@@ -1610,7 +1610,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/sha.h
@@ -1630,7 +1630,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl2.h
@@ -1642,11 +1642,11 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/stack.h
@@ -1710,7 +1710,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509err.h
@@ -1726,7 +1726,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/Info.plist
- Wx0Sw4H53tuW3NqecVlInMDXno4=
+ 1fmnrzc1+fTlJCB5QahopmxgsCE=
ios-arm64_x86_64-simulator/OpenSSL.framework/Modules/module.modulemap
@@ -1734,7 +1734,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL
- q9iM5x2mXn+A54mbHgXuLArAnGg=
+ lE9L6ExnwtaLBPEBl/5jFn82m60=
ios-arm64_x86_64-simulator/OpenSSL.framework/PrivacyInfo.xcprivacy
@@ -1742,7 +1742,7 @@
ios-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources
- eWd3qtmct8/l+Kb1qHnrNDRxnxc=
+ q3znbvhYq+Oe5rcYCZIILqK3p9E=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/OpenSSL.h
@@ -1758,7 +1758,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/asn1t.h
@@ -1774,7 +1774,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/bioerr.h
@@ -1814,7 +1814,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/cmp_util.h
@@ -1822,7 +1822,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/cms.h
@@ -1842,7 +1842,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/conf_api.h
@@ -1854,7 +1854,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/configuration.h
- lScZfdfcK3XXRdUgxXzIzzZ9CoM=
+ i+9GbPbFWiftInpFiRJ9aEvJmFk=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/conftypes.h
@@ -1866,11 +1866,11 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/core_object.h
@@ -1918,7 +1918,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/dherr.h
@@ -1982,7 +1982,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/ess.h
@@ -1994,7 +1994,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/evperr.h
@@ -2014,15 +2014,15 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/idea.h
@@ -2038,7 +2038,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/macros.h
@@ -2066,7 +2066,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/objects.h
@@ -2090,7 +2090,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/ossl_typ.h
@@ -2126,7 +2126,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/pkcs7err.h
@@ -2146,7 +2146,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/rand.h
@@ -2190,7 +2190,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/sha.h
@@ -2210,7 +2210,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/ssl2.h
@@ -2222,11 +2222,11 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/stack.h
@@ -2290,7 +2290,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/x509err.h
@@ -2310,11 +2310,11 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/OpenSSL
- PDry7lDe12unud2VEVBYjXHZJ+8=
+ JZty5X1iBChh5AOTz6HXhNCamug=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Resources/Info.plist
- ygSh/JNcojZ+defoLJ/ubUODJLc=
+ RVfpW11pj5w5M5ZTL/SkqGynaN8=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Resources/PrivacyInfo.xcprivacy
@@ -2322,7 +2322,7 @@
macos-arm64_x86_64/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources
- z61dC00PwhxwyWfylvAv7YprDZU=
+ q/j3Ta+L3hNfrPNjdz46equS2AI=
tvos-arm64/OpenSSL.framework/Headers/OpenSSL.h
@@ -2338,7 +2338,7 @@
tvos-arm64/OpenSSL.framework/Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
tvos-arm64/OpenSSL.framework/Headers/asn1t.h
@@ -2354,7 +2354,7 @@
tvos-arm64/OpenSSL.framework/Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
tvos-arm64/OpenSSL.framework/Headers/bioerr.h
@@ -2394,7 +2394,7 @@
tvos-arm64/OpenSSL.framework/Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
tvos-arm64/OpenSSL.framework/Headers/cmp_util.h
@@ -2402,7 +2402,7 @@
tvos-arm64/OpenSSL.framework/Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
tvos-arm64/OpenSSL.framework/Headers/cms.h
@@ -2422,7 +2422,7 @@
tvos-arm64/OpenSSL.framework/Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
tvos-arm64/OpenSSL.framework/Headers/conf_api.h
@@ -2434,7 +2434,7 @@
tvos-arm64/OpenSSL.framework/Headers/configuration.h
- 31BE8LwRUj29KzYtu8s7CYNvvoY=
+ uq6EBUgROXJefAoIu8jjfcdUMSg=
tvos-arm64/OpenSSL.framework/Headers/conftypes.h
@@ -2446,11 +2446,11 @@
tvos-arm64/OpenSSL.framework/Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
tvos-arm64/OpenSSL.framework/Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
tvos-arm64/OpenSSL.framework/Headers/core_object.h
@@ -2498,7 +2498,7 @@
tvos-arm64/OpenSSL.framework/Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
tvos-arm64/OpenSSL.framework/Headers/dherr.h
@@ -2562,7 +2562,7 @@
tvos-arm64/OpenSSL.framework/Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
tvos-arm64/OpenSSL.framework/Headers/ess.h
@@ -2574,7 +2574,7 @@
tvos-arm64/OpenSSL.framework/Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
tvos-arm64/OpenSSL.framework/Headers/evperr.h
@@ -2594,15 +2594,15 @@
tvos-arm64/OpenSSL.framework/Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
tvos-arm64/OpenSSL.framework/Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
tvos-arm64/OpenSSL.framework/Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
tvos-arm64/OpenSSL.framework/Headers/idea.h
@@ -2618,7 +2618,7 @@
tvos-arm64/OpenSSL.framework/Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
tvos-arm64/OpenSSL.framework/Headers/macros.h
@@ -2646,7 +2646,7 @@
tvos-arm64/OpenSSL.framework/Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
tvos-arm64/OpenSSL.framework/Headers/objects.h
@@ -2670,7 +2670,7 @@
tvos-arm64/OpenSSL.framework/Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
tvos-arm64/OpenSSL.framework/Headers/ossl_typ.h
@@ -2706,7 +2706,7 @@
tvos-arm64/OpenSSL.framework/Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
tvos-arm64/OpenSSL.framework/Headers/pkcs7err.h
@@ -2726,7 +2726,7 @@
tvos-arm64/OpenSSL.framework/Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
tvos-arm64/OpenSSL.framework/Headers/rand.h
@@ -2770,7 +2770,7 @@
tvos-arm64/OpenSSL.framework/Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
tvos-arm64/OpenSSL.framework/Headers/sha.h
@@ -2790,7 +2790,7 @@
tvos-arm64/OpenSSL.framework/Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
tvos-arm64/OpenSSL.framework/Headers/ssl2.h
@@ -2802,11 +2802,11 @@
tvos-arm64/OpenSSL.framework/Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
tvos-arm64/OpenSSL.framework/Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
tvos-arm64/OpenSSL.framework/Headers/stack.h
@@ -2870,7 +2870,7 @@
tvos-arm64/OpenSSL.framework/Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
tvos-arm64/OpenSSL.framework/Headers/x509err.h
@@ -2886,7 +2886,7 @@
tvos-arm64/OpenSSL.framework/Info.plist
- +KCnD2Ok5EzpN+IJyljnRpZaVNw=
+ 8A79UJgte5+L5td+gODvDoGGl8I=
tvos-arm64/OpenSSL.framework/Modules/module.modulemap
@@ -2894,7 +2894,7 @@
tvos-arm64/OpenSSL.framework/OpenSSL
- vafs0Gdc3tkRfJuQ4JjeyCrW/tE=
+ lxGTOwyWFNXZOfzOrtsFfAhLrMY=
tvos-arm64/OpenSSL.framework/PrivacyInfo.xcprivacy
@@ -2902,7 +2902,7 @@
tvos-arm64/OpenSSL.framework/_CodeSignature/CodeResources
- C8CXTyLi7JpI0jtr+EYLYsNzc58=
+ xh8zPeiHSdXJVPf4vV4le6Ve8yA=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/OpenSSL.h
@@ -2918,7 +2918,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1t.h
@@ -2934,7 +2934,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/bioerr.h
@@ -2974,7 +2974,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp_util.h
@@ -2982,7 +2982,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cms.h
@@ -3002,7 +3002,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf_api.h
@@ -3014,7 +3014,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h
- 31BE8LwRUj29KzYtu8s7CYNvvoY=
+ uq6EBUgROXJefAoIu8jjfcdUMSg=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conftypes.h
@@ -3026,11 +3026,11 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_object.h
@@ -3078,7 +3078,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/dherr.h
@@ -3142,7 +3142,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ess.h
@@ -3154,7 +3154,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/evperr.h
@@ -3174,15 +3174,15 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/idea.h
@@ -3198,7 +3198,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/macros.h
@@ -3226,7 +3226,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/objects.h
@@ -3250,7 +3250,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ossl_typ.h
@@ -3286,7 +3286,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7err.h
@@ -3306,7 +3306,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/rand.h
@@ -3350,7 +3350,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sha.h
@@ -3370,7 +3370,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl2.h
@@ -3382,11 +3382,11 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/stack.h
@@ -3450,7 +3450,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509err.h
@@ -3466,7 +3466,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/Info.plist
- gd7rWr8OhyDXUVClEo5R5CxFUjQ=
+ RujmUhI9pGkvC2ffIjcIJJ7xTBA=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Modules/module.modulemap
@@ -3474,7 +3474,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL
- cVV2aKrAO0bY8Qv7kIfqwOV5+XU=
+ 9E++9WNEj+TbE0uJP8nOTAhHl/4=
tvos-arm64_x86_64-simulator/OpenSSL.framework/PrivacyInfo.xcprivacy
@@ -3482,7 +3482,7 @@
tvos-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources
- 4Zk2Yw2gG2t+9OksayZGVL5EP5I=
+ +Qg7DKkZDQ0KJpBfLiMQwm3/G74=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/OpenSSL.h
@@ -3498,7 +3498,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/asn1t.h
@@ -3514,7 +3514,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/bioerr.h
@@ -3554,7 +3554,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/cmp_util.h
@@ -3562,7 +3562,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/cms.h
@@ -3582,7 +3582,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/conf_api.h
@@ -3594,7 +3594,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/configuration.h
- mp4WLl5nQWdzgpf97VWrQ5tGnbY=
+ 2105ELXL7WvSfSB26S9l/juILmg=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/conftypes.h
@@ -3606,11 +3606,11 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/core_object.h
@@ -3658,7 +3658,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/dherr.h
@@ -3722,7 +3722,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/ess.h
@@ -3734,7 +3734,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/evperr.h
@@ -3754,15 +3754,15 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/idea.h
@@ -3778,7 +3778,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/macros.h
@@ -3806,7 +3806,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/objects.h
@@ -3830,7 +3830,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/ossl_typ.h
@@ -3866,7 +3866,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/pkcs7err.h
@@ -3886,7 +3886,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/rand.h
@@ -3930,7 +3930,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/sha.h
@@ -3950,7 +3950,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/ssl2.h
@@ -3962,11 +3962,11 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/stack.h
@@ -4030,7 +4030,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/x509err.h
@@ -4046,7 +4046,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Info.plist
- WsRRl8h68x1Yl3IxQopDVCxzZAM=
+ W9oyX9WV39Z79V9nzFllt5GEQzg=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Modules/module.modulemap
@@ -4054,7 +4054,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/OpenSSL
- Z1/jv/bLilofslm6qhQIfU8x9nc=
+ EKbjqyRkc2QtO5V29uwhZliW1WU=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/PrivacyInfo.xcprivacy
@@ -4062,7 +4062,7 @@
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/_CodeSignature/CodeResources
- NW2synqq1hfrFw4e5LrNHAKk7Jk=
+ cudZOh2ccY7ARzXYxyDhwbbos5M=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/OpenSSL.h
@@ -4078,7 +4078,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1t.h
@@ -4094,7 +4094,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/bioerr.h
@@ -4134,7 +4134,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp_util.h
@@ -4142,7 +4142,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cms.h
@@ -4162,7 +4162,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf_api.h
@@ -4174,7 +4174,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h
- mp4WLl5nQWdzgpf97VWrQ5tGnbY=
+ 2105ELXL7WvSfSB26S9l/juILmg=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conftypes.h
@@ -4186,11 +4186,11 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_object.h
@@ -4238,7 +4238,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/dherr.h
@@ -4302,7 +4302,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ess.h
@@ -4314,7 +4314,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/evperr.h
@@ -4334,15 +4334,15 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/idea.h
@@ -4358,7 +4358,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/macros.h
@@ -4386,7 +4386,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/objects.h
@@ -4410,7 +4410,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ossl_typ.h
@@ -4446,7 +4446,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7err.h
@@ -4466,7 +4466,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/rand.h
@@ -4510,7 +4510,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sha.h
@@ -4530,7 +4530,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl2.h
@@ -4542,11 +4542,11 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/stack.h
@@ -4610,7 +4610,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509err.h
@@ -4626,7 +4626,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/Info.plist
- HLzm/NeSNfFVhCsA8UzYIsaUqHM=
+ BaBjJFDy/wmh+4hCtvTo+wR8/t4=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Modules/module.modulemap
@@ -4634,7 +4634,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL
- Js75VAcaY86wGetSiwdzgCTb+yw=
+ EuZQWGQtthYXV/JHO0hP+RJiv2Y=
watchos-arm64_x86_64-simulator/OpenSSL.framework/PrivacyInfo.xcprivacy
@@ -4642,7 +4642,7 @@
watchos-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources
- vjgXs87TkvGD3NE/5/BYke8Cdx0=
+ WxS3IS8S6+BQV+5v3HTac4NcpmY=
xros-arm64/OpenSSL.framework/Headers/OpenSSL.h
@@ -4658,7 +4658,7 @@
xros-arm64/OpenSSL.framework/Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
xros-arm64/OpenSSL.framework/Headers/asn1t.h
@@ -4674,7 +4674,7 @@
xros-arm64/OpenSSL.framework/Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
xros-arm64/OpenSSL.framework/Headers/bioerr.h
@@ -4714,7 +4714,7 @@
xros-arm64/OpenSSL.framework/Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
xros-arm64/OpenSSL.framework/Headers/cmp_util.h
@@ -4722,7 +4722,7 @@
xros-arm64/OpenSSL.framework/Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
xros-arm64/OpenSSL.framework/Headers/cms.h
@@ -4742,7 +4742,7 @@
xros-arm64/OpenSSL.framework/Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
xros-arm64/OpenSSL.framework/Headers/conf_api.h
@@ -4754,7 +4754,7 @@
xros-arm64/OpenSSL.framework/Headers/configuration.h
- yjr15PIOf/CqzXE+85wawHh2fs8=
+ QHnJsrU4bBKEKavpabchMyFg1qw=
xros-arm64/OpenSSL.framework/Headers/conftypes.h
@@ -4766,11 +4766,11 @@
xros-arm64/OpenSSL.framework/Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
xros-arm64/OpenSSL.framework/Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
xros-arm64/OpenSSL.framework/Headers/core_object.h
@@ -4818,7 +4818,7 @@
xros-arm64/OpenSSL.framework/Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
xros-arm64/OpenSSL.framework/Headers/dherr.h
@@ -4882,7 +4882,7 @@
xros-arm64/OpenSSL.framework/Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
xros-arm64/OpenSSL.framework/Headers/ess.h
@@ -4894,7 +4894,7 @@
xros-arm64/OpenSSL.framework/Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
xros-arm64/OpenSSL.framework/Headers/evperr.h
@@ -4914,15 +4914,15 @@
xros-arm64/OpenSSL.framework/Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
xros-arm64/OpenSSL.framework/Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
xros-arm64/OpenSSL.framework/Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
xros-arm64/OpenSSL.framework/Headers/idea.h
@@ -4938,7 +4938,7 @@
xros-arm64/OpenSSL.framework/Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
xros-arm64/OpenSSL.framework/Headers/macros.h
@@ -4966,7 +4966,7 @@
xros-arm64/OpenSSL.framework/Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
xros-arm64/OpenSSL.framework/Headers/objects.h
@@ -4990,7 +4990,7 @@
xros-arm64/OpenSSL.framework/Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
xros-arm64/OpenSSL.framework/Headers/ossl_typ.h
@@ -5026,7 +5026,7 @@
xros-arm64/OpenSSL.framework/Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
xros-arm64/OpenSSL.framework/Headers/pkcs7err.h
@@ -5046,7 +5046,7 @@
xros-arm64/OpenSSL.framework/Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
xros-arm64/OpenSSL.framework/Headers/rand.h
@@ -5090,7 +5090,7 @@
xros-arm64/OpenSSL.framework/Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
xros-arm64/OpenSSL.framework/Headers/sha.h
@@ -5110,7 +5110,7 @@
xros-arm64/OpenSSL.framework/Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
xros-arm64/OpenSSL.framework/Headers/ssl2.h
@@ -5122,11 +5122,11 @@
xros-arm64/OpenSSL.framework/Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
xros-arm64/OpenSSL.framework/Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
xros-arm64/OpenSSL.framework/Headers/stack.h
@@ -5190,7 +5190,7 @@
xros-arm64/OpenSSL.framework/Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
xros-arm64/OpenSSL.framework/Headers/x509err.h
@@ -5206,7 +5206,7 @@
xros-arm64/OpenSSL.framework/Info.plist
- bah+ENbAp1Hpqi3etWGe3quZea0=
+ /XbqrrnFkhc9Trgp5hE4N03KGbI=
xros-arm64/OpenSSL.framework/Modules/module.modulemap
@@ -5214,7 +5214,7 @@
xros-arm64/OpenSSL.framework/OpenSSL
- uyymGMp16tTb2784jGasLFclgcQ=
+ YWQ0YruvWa8K4Rcwq6glLGSpO7A=
xros-arm64/OpenSSL.framework/PrivacyInfo.xcprivacy
@@ -5222,7 +5222,7 @@
xros-arm64/OpenSSL.framework/_CodeSignature/CodeResources
- 2dBykbxAEg2+Lru1wHo619dMqmw=
+ bNhaIOtpvHof1CDtbQS5c/x6+pY=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/OpenSSL.h
@@ -5238,7 +5238,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1t.h
@@ -5254,7 +5254,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/bioerr.h
@@ -5294,7 +5294,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp_util.h
@@ -5302,7 +5302,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/cms.h
@@ -5322,7 +5322,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf_api.h
@@ -5334,7 +5334,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h
- yjr15PIOf/CqzXE+85wawHh2fs8=
+ QHnJsrU4bBKEKavpabchMyFg1qw=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/conftypes.h
@@ -5346,11 +5346,11 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_object.h
@@ -5398,7 +5398,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/dherr.h
@@ -5462,7 +5462,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/ess.h
@@ -5474,7 +5474,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/evperr.h
@@ -5494,15 +5494,15 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/idea.h
@@ -5518,7 +5518,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/macros.h
@@ -5546,7 +5546,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/objects.h
@@ -5570,7 +5570,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/ossl_typ.h
@@ -5606,7 +5606,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7err.h
@@ -5626,7 +5626,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/rand.h
@@ -5670,7 +5670,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/sha.h
@@ -5690,7 +5690,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl2.h
@@ -5702,11 +5702,11 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/stack.h
@@ -5770,7 +5770,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509err.h
@@ -5786,7 +5786,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/Info.plist
- JNDlylPmM0ICLugnp7oBSPEc+I0=
+ gfVRBzQuHVlKIE3HAhPmhpt8z7g=
xros-arm64_x86_64-simulator/OpenSSL.framework/Modules/module.modulemap
@@ -5794,7 +5794,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL
- ZtAv+X5o8mZ9ynkghcyygulEyWI=
+ 6a6hSSpSM/Dvyeu5Xnz5ZzTdaqQ=
xros-arm64_x86_64-simulator/OpenSSL.framework/PrivacyInfo.xcprivacy
@@ -5802,7 +5802,7 @@
xros-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources
- JpugKEilXXUy158vYwyBom/CX8Q=
+ nKQC+b8gu3cOxpe0RscFuCBj5XM=
files2
@@ -5844,11 +5844,11 @@
hash
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
ios-arm64/OpenSSL.framework/Headers/asn1t.h
@@ -5888,11 +5888,11 @@
hash
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
ios-arm64/OpenSSL.framework/Headers/bioerr.h
@@ -5998,11 +5998,11 @@
hash
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
ios-arm64/OpenSSL.framework/Headers/cmp_util.h
@@ -6020,11 +6020,11 @@
hash
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
ios-arm64/OpenSSL.framework/Headers/cms.h
@@ -6075,11 +6075,11 @@
hash
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
ios-arm64/OpenSSL.framework/Headers/conf_api.h
@@ -6108,11 +6108,11 @@
hash
- ia9Lq9Ma5Kl0sdwkNFmHsS3OUkU=
+ MFiooVP1OE4028WfQZREAH2Ma64=
hash2
- U+oCGPKn5mmjbIJuiM9+qxL6r+Nyru/o9FRYnKGxn88=
+ nYZRBqi1sSU1SGq1+GEl+ZtOkMzUzBwMp4jmSNG+gF4=
ios-arm64/OpenSSL.framework/Headers/conftypes.h
@@ -6141,22 +6141,22 @@
hash
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
ios-arm64/OpenSSL.framework/Headers/core_names.h
hash
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
ios-arm64/OpenSSL.framework/Headers/core_object.h
@@ -6284,11 +6284,11 @@
hash
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
ios-arm64/OpenSSL.framework/Headers/dherr.h
@@ -6460,11 +6460,11 @@
hash
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
ios-arm64/OpenSSL.framework/Headers/ess.h
@@ -6493,11 +6493,11 @@
hash
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
ios-arm64/OpenSSL.framework/Headers/evperr.h
@@ -6548,33 +6548,33 @@
hash
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
ios-arm64/OpenSSL.framework/Headers/http.h
hash
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
ios-arm64/OpenSSL.framework/Headers/httperr.h
hash
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
ios-arm64/OpenSSL.framework/Headers/idea.h
@@ -6614,11 +6614,11 @@
hash
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
ios-arm64/OpenSSL.framework/Headers/macros.h
@@ -6691,11 +6691,11 @@
hash
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
ios-arm64/OpenSSL.framework/Headers/objects.h
@@ -6757,11 +6757,11 @@
hash
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
ios-arm64/OpenSSL.framework/Headers/ossl_typ.h
@@ -6856,11 +6856,11 @@
hash
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
ios-arm64/OpenSSL.framework/Headers/pkcs7err.h
@@ -6911,11 +6911,11 @@
hash
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
ios-arm64/OpenSSL.framework/Headers/rand.h
@@ -7032,11 +7032,11 @@
hash
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
ios-arm64/OpenSSL.framework/Headers/sha.h
@@ -7087,11 +7087,11 @@
hash
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
ios-arm64/OpenSSL.framework/Headers/ssl2.h
@@ -7120,22 +7120,22 @@
hash
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
ios-arm64/OpenSSL.framework/Headers/sslerr_legacy.h
hash
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
ios-arm64/OpenSSL.framework/Headers/stack.h
@@ -7307,11 +7307,11 @@
hash
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
ios-arm64/OpenSSL.framework/Headers/x509err.h
@@ -7351,11 +7351,11 @@
hash
- QrYuUiaf0eAsvjMGE/3sfZCnj4w=
+ 0M5H0ChbB+HbzSq0fxnVTEuStwM=
hash2
- MRmdqi7o64zQeeEzXyVuVnyppULwR62CENH2DLFXEmY=
+ QzxIXyqtMwsO7lvjvyKXOL3x/giC5cNZIjC+hMfE26c=
ios-arm64/OpenSSL.framework/Modules/module.modulemap
@@ -7373,11 +7373,11 @@
hash
- 7JonS9XM9veasPdXQEhq+nihrRY=
+ W7uFmy9Ecf9hCnYNZIV8EryPx9A=
hash2
- 3PitdlxxHUwxthm6dMGWSfJw4RTHnBgjAtwEA5g0vZE=
+ cYGvEOz4x5268V6B71cVQocVZlCJMnR63wouNr8ywpk=
ios-arm64/OpenSSL.framework/PrivacyInfo.xcprivacy
@@ -7395,11 +7395,11 @@
hash
- fC3oucFnqWZPqNAJ10CQhnPJk8Y=
+ 8WzMZW73b2KvTo5pjRehz1O5DFY=
hash2
- G9NBOFfM2hZurj6x4/NykX33CixPdq1l8RS92Yi7b08=
+ FSI+AVs0AQViZrbo9pG1UjX1hgiO+4jw4A8ItJ47QWQ=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Headers
@@ -7459,11 +7459,11 @@
hash
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/asn1t.h
@@ -7503,11 +7503,11 @@
hash
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/bioerr.h
@@ -7613,11 +7613,11 @@
hash
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/cmp_util.h
@@ -7635,11 +7635,11 @@
hash
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/cms.h
@@ -7690,11 +7690,11 @@
hash
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/conf_api.h
@@ -7723,11 +7723,11 @@
hash
- lScZfdfcK3XXRdUgxXzIzzZ9CoM=
+ i+9GbPbFWiftInpFiRJ9aEvJmFk=
hash2
- +jfF9b6H8IHvka44tRlIBPNUCGZJHt5pUyvP/gzKB1U=
+ vPsBXnSq792SdhY8trfuMoDoG/ngWckXRzIMy71iz4Q=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/conftypes.h
@@ -7756,22 +7756,22 @@
hash
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/core_names.h
hash
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/core_object.h
@@ -7899,11 +7899,11 @@
hash
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/dherr.h
@@ -8075,11 +8075,11 @@
hash
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/ess.h
@@ -8108,11 +8108,11 @@
hash
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/evperr.h
@@ -8163,33 +8163,33 @@
hash
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/http.h
hash
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/httperr.h
hash
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/idea.h
@@ -8229,11 +8229,11 @@
hash
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/macros.h
@@ -8306,11 +8306,11 @@
hash
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/objects.h
@@ -8372,11 +8372,11 @@
hash
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/ossl_typ.h
@@ -8471,11 +8471,11 @@
hash
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/pkcs7err.h
@@ -8526,11 +8526,11 @@
hash
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/rand.h
@@ -8647,11 +8647,11 @@
hash
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/sha.h
@@ -8702,11 +8702,11 @@
hash
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/ssl2.h
@@ -8735,22 +8735,22 @@
hash
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h
hash
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/stack.h
@@ -8922,11 +8922,11 @@
hash
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/x509err.h
@@ -8977,22 +8977,22 @@
hash
- OtyS1Dz6HLbi3iD9en5zLUCY1Cs=
+ GWxse/66X5T7RNWVAVxlaWkLGgg=
hash2
- lItXVa1QYAgaq54rK4J6ZbZRLQdC0/IX2jtL6dsusGU=
+ yyT9Lj8B50GNzJPuwQMWRbc3I4ph7t+fPfb0S+Pfka4=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Resources/Info.plist
hash
- locKjucac2EJ89FRFaQ2fAquWYc=
+ 5W0vEiZk7ITLhx3QF5fsQmDSSNc=
hash2
- ez/Aj0H33BcLqRgrYn5ICQTTXnbR7jOS5WgmhhjSVUg=
+ VcU7auj9ICh7uMZaOAU/f692zrBm9+U0FO4t+jnHU8g=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Resources/PrivacyInfo.xcprivacy
@@ -9010,11 +9010,11 @@
hash
- hrSqgBpvYsXxI967h50+QSo7A7w=
+ 1AL6uDYUrUO/++r9FvoxPoZNW+c=
hash2
- cceqFNG102ub9xGF1i/D88uhzK5cCb0KfmGSLWrvyPE=
+ 3/uNodLBlq8izZTjzswdOoEVGT9f0b/7clJw37I1Qww=
ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/Current
@@ -9059,11 +9059,11 @@
hash
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1t.h
@@ -9103,11 +9103,11 @@
hash
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/bioerr.h
@@ -9213,11 +9213,11 @@
hash
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp_util.h
@@ -9235,11 +9235,11 @@
hash
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/cms.h
@@ -9290,11 +9290,11 @@
hash
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf_api.h
@@ -9323,11 +9323,11 @@
hash
- ia9Lq9Ma5Kl0sdwkNFmHsS3OUkU=
+ MFiooVP1OE4028WfQZREAH2Ma64=
hash2
- U+oCGPKn5mmjbIJuiM9+qxL6r+Nyru/o9FRYnKGxn88=
+ nYZRBqi1sSU1SGq1+GEl+ZtOkMzUzBwMp4jmSNG+gF4=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/conftypes.h
@@ -9356,22 +9356,22 @@
hash
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
hash
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_object.h
@@ -9499,11 +9499,11 @@
hash
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/dherr.h
@@ -9675,11 +9675,11 @@
hash
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/ess.h
@@ -9708,11 +9708,11 @@
hash
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/evperr.h
@@ -9763,33 +9763,33 @@
hash
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
hash
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
hash
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/idea.h
@@ -9829,11 +9829,11 @@
hash
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/macros.h
@@ -9906,11 +9906,11 @@
hash
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/objects.h
@@ -9972,11 +9972,11 @@
hash
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/ossl_typ.h
@@ -10071,11 +10071,11 @@
hash
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7err.h
@@ -10126,11 +10126,11 @@
hash
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/rand.h
@@ -10247,11 +10247,11 @@
hash
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/sha.h
@@ -10302,11 +10302,11 @@
hash
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl2.h
@@ -10335,22 +10335,22 @@
hash
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
hash
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/stack.h
@@ -10522,11 +10522,11 @@
hash
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509err.h
@@ -10566,11 +10566,11 @@
hash
- Wx0Sw4H53tuW3NqecVlInMDXno4=
+ 1fmnrzc1+fTlJCB5QahopmxgsCE=
hash2
- gMk5rxj8HmTLxEjMno/GnrNq3cDd+KTQMwcjSUWyJpo=
+ 7mT/E2SEVXk9Nz1Xg2U3zxgBoN+OyFP6CFfxseYCugA=
ios-arm64_x86_64-simulator/OpenSSL.framework/Modules/module.modulemap
@@ -10588,11 +10588,11 @@
hash
- q9iM5x2mXn+A54mbHgXuLArAnGg=
+ lE9L6ExnwtaLBPEBl/5jFn82m60=
hash2
- 4ihcMeQlnzveT6vlogYf/W+Lg4mayZoXdmtJhCEgYY4=
+ IX2iv7aeMkLiDlnaUlIMSxt5Ep6hHIbN5QOJyU2r8WE=
ios-arm64_x86_64-simulator/OpenSSL.framework/PrivacyInfo.xcprivacy
@@ -10610,11 +10610,11 @@
hash
- eWd3qtmct8/l+Kb1qHnrNDRxnxc=
+ q3znbvhYq+Oe5rcYCZIILqK3p9E=
hash2
- QSrokYkggRiOg8rQjZv/6wxG3vvYIY6WW8ZTqbgmmiY=
+ p+U0hbg2AMaM9kJvTb3z9QwkYIE6SAyZxRuCddikOM0=
macos-arm64_x86_64/OpenSSL.framework/Headers
@@ -10674,11 +10674,11 @@
hash
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/asn1t.h
@@ -10718,11 +10718,11 @@
hash
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/bioerr.h
@@ -10828,11 +10828,11 @@
hash
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/cmp_util.h
@@ -10850,11 +10850,11 @@
hash
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/cms.h
@@ -10905,11 +10905,11 @@
hash
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/conf_api.h
@@ -10938,11 +10938,11 @@
hash
- lScZfdfcK3XXRdUgxXzIzzZ9CoM=
+ i+9GbPbFWiftInpFiRJ9aEvJmFk=
hash2
- +jfF9b6H8IHvka44tRlIBPNUCGZJHt5pUyvP/gzKB1U=
+ vPsBXnSq792SdhY8trfuMoDoG/ngWckXRzIMy71iz4Q=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/conftypes.h
@@ -10971,22 +10971,22 @@
hash
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/core_names.h
hash
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/core_object.h
@@ -11114,11 +11114,11 @@
hash
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/dherr.h
@@ -11290,11 +11290,11 @@
hash
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/ess.h
@@ -11323,11 +11323,11 @@
hash
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/evperr.h
@@ -11378,33 +11378,33 @@
hash
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/http.h
hash
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/httperr.h
hash
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/idea.h
@@ -11444,11 +11444,11 @@
hash
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/macros.h
@@ -11521,11 +11521,11 @@
hash
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/objects.h
@@ -11587,11 +11587,11 @@
hash
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/ossl_typ.h
@@ -11686,11 +11686,11 @@
hash
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/pkcs7err.h
@@ -11741,11 +11741,11 @@
hash
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/rand.h
@@ -11862,11 +11862,11 @@
hash
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/sha.h
@@ -11917,11 +11917,11 @@
hash
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/ssl2.h
@@ -11950,22 +11950,22 @@
hash
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h
hash
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/stack.h
@@ -12137,11 +12137,11 @@
hash
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/x509err.h
@@ -12192,22 +12192,22 @@
hash
- PDry7lDe12unud2VEVBYjXHZJ+8=
+ JZty5X1iBChh5AOTz6HXhNCamug=
hash2
- pP28PwrFoF0Pima2Q0O/l0hEvp2H9Vr2wZQD8Bb3mWQ=
+ Pa0YIwsFiBnYlZDaIURRcs8KHynFQnfN+WZ4Qm5aHyc=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Resources/Info.plist
hash
- ygSh/JNcojZ+defoLJ/ubUODJLc=
+ RVfpW11pj5w5M5ZTL/SkqGynaN8=
hash2
- X+T9j5rz5orbYzukuy7H2TfiCOx9yj/t2Vxn7bcwYwg=
+ 3F/RwVsnL4REPwj/FLKyYJA3570XliTO/lTmKe/HzQM=
macos-arm64_x86_64/OpenSSL.framework/Versions/A/Resources/PrivacyInfo.xcprivacy
@@ -12225,11 +12225,11 @@
hash
- z61dC00PwhxwyWfylvAv7YprDZU=
+ q/j3Ta+L3hNfrPNjdz46equS2AI=
hash2
- hSzlLV/sxaqYvaLnG/2HjoYMAxe7HfCj8u3Y9BeKgog=
+ QRuA81z8KWhl3e/2bdATfKa8hLsTPUbSpBg19FPAaT4=
macos-arm64_x86_64/OpenSSL.framework/Versions/Current
@@ -12274,11 +12274,11 @@
hash
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
tvos-arm64/OpenSSL.framework/Headers/asn1t.h
@@ -12318,11 +12318,11 @@
hash
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
tvos-arm64/OpenSSL.framework/Headers/bioerr.h
@@ -12428,11 +12428,11 @@
hash
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
tvos-arm64/OpenSSL.framework/Headers/cmp_util.h
@@ -12450,11 +12450,11 @@
hash
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
tvos-arm64/OpenSSL.framework/Headers/cms.h
@@ -12505,11 +12505,11 @@
hash
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
tvos-arm64/OpenSSL.framework/Headers/conf_api.h
@@ -12538,11 +12538,11 @@
hash
- 31BE8LwRUj29KzYtu8s7CYNvvoY=
+ uq6EBUgROXJefAoIu8jjfcdUMSg=
hash2
- ER9xEddHqSW07OKwxmxDF6wnf3kxWVZk/1pXhWOkMRg=
+ 0xjQLhfP7NnFyVR7Zyunl/Vf475YpuuV5M/sNQckdd0=
tvos-arm64/OpenSSL.framework/Headers/conftypes.h
@@ -12571,22 +12571,22 @@
hash
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
tvos-arm64/OpenSSL.framework/Headers/core_names.h
hash
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
tvos-arm64/OpenSSL.framework/Headers/core_object.h
@@ -12714,11 +12714,11 @@
hash
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
tvos-arm64/OpenSSL.framework/Headers/dherr.h
@@ -12890,11 +12890,11 @@
hash
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
tvos-arm64/OpenSSL.framework/Headers/ess.h
@@ -12923,11 +12923,11 @@
hash
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
tvos-arm64/OpenSSL.framework/Headers/evperr.h
@@ -12978,33 +12978,33 @@
hash
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
tvos-arm64/OpenSSL.framework/Headers/http.h
hash
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
tvos-arm64/OpenSSL.framework/Headers/httperr.h
hash
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
tvos-arm64/OpenSSL.framework/Headers/idea.h
@@ -13044,11 +13044,11 @@
hash
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
tvos-arm64/OpenSSL.framework/Headers/macros.h
@@ -13121,11 +13121,11 @@
hash
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
tvos-arm64/OpenSSL.framework/Headers/objects.h
@@ -13187,11 +13187,11 @@
hash
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
tvos-arm64/OpenSSL.framework/Headers/ossl_typ.h
@@ -13286,11 +13286,11 @@
hash
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
tvos-arm64/OpenSSL.framework/Headers/pkcs7err.h
@@ -13341,11 +13341,11 @@
hash
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
tvos-arm64/OpenSSL.framework/Headers/rand.h
@@ -13462,11 +13462,11 @@
hash
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
tvos-arm64/OpenSSL.framework/Headers/sha.h
@@ -13517,11 +13517,11 @@
hash
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
tvos-arm64/OpenSSL.framework/Headers/ssl2.h
@@ -13550,22 +13550,22 @@
hash
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
tvos-arm64/OpenSSL.framework/Headers/sslerr_legacy.h
hash
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
tvos-arm64/OpenSSL.framework/Headers/stack.h
@@ -13737,11 +13737,11 @@
hash
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
tvos-arm64/OpenSSL.framework/Headers/x509err.h
@@ -13781,11 +13781,11 @@
hash
- +KCnD2Ok5EzpN+IJyljnRpZaVNw=
+ 8A79UJgte5+L5td+gODvDoGGl8I=
hash2
- PKHco/SMnSI8FStTmuehhnGEd73EcTltbMQh9JtwNtA=
+ 5kkl8NipcC+WRNeWrIM8sjvZMWzLlBhxzOmGNkslGu4=
tvos-arm64/OpenSSL.framework/Modules/module.modulemap
@@ -13803,11 +13803,11 @@
hash
- vafs0Gdc3tkRfJuQ4JjeyCrW/tE=
+ lxGTOwyWFNXZOfzOrtsFfAhLrMY=
hash2
- E2AcRg1hdtS0TZt5VjH2EZpHS4HlodHUkMKTDBLM4tM=
+ t3oCitCxTgUBwU0WsZlXFZ4mt0mYhKzAMk8njBLMJaI=
tvos-arm64/OpenSSL.framework/PrivacyInfo.xcprivacy
@@ -13825,11 +13825,11 @@
hash
- C8CXTyLi7JpI0jtr+EYLYsNzc58=
+ xh8zPeiHSdXJVPf4vV4le6Ve8yA=
hash2
- kzCgm2WwCoRphy5CwBYhn1OmnnP/ymD7Ff69rjB7qc4=
+ nZnNo6DV4IhmsO/9On4taSIEScGC5P+I10AKc24wvUA=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/OpenSSL.h
@@ -13869,11 +13869,11 @@
hash
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1t.h
@@ -13913,11 +13913,11 @@
hash
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/bioerr.h
@@ -14023,11 +14023,11 @@
hash
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp_util.h
@@ -14045,11 +14045,11 @@
hash
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cms.h
@@ -14100,11 +14100,11 @@
hash
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf_api.h
@@ -14133,11 +14133,11 @@
hash
- 31BE8LwRUj29KzYtu8s7CYNvvoY=
+ uq6EBUgROXJefAoIu8jjfcdUMSg=
hash2
- ER9xEddHqSW07OKwxmxDF6wnf3kxWVZk/1pXhWOkMRg=
+ 0xjQLhfP7NnFyVR7Zyunl/Vf475YpuuV5M/sNQckdd0=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conftypes.h
@@ -14166,22 +14166,22 @@
hash
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
hash
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_object.h
@@ -14309,11 +14309,11 @@
hash
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/dherr.h
@@ -14485,11 +14485,11 @@
hash
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ess.h
@@ -14518,11 +14518,11 @@
hash
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/evperr.h
@@ -14573,33 +14573,33 @@
hash
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
hash
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
hash
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/idea.h
@@ -14639,11 +14639,11 @@
hash
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/macros.h
@@ -14716,11 +14716,11 @@
hash
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/objects.h
@@ -14782,11 +14782,11 @@
hash
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ossl_typ.h
@@ -14881,11 +14881,11 @@
hash
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7err.h
@@ -14936,11 +14936,11 @@
hash
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/rand.h
@@ -15057,11 +15057,11 @@
hash
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sha.h
@@ -15112,11 +15112,11 @@
hash
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl2.h
@@ -15145,22 +15145,22 @@
hash
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
hash
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/stack.h
@@ -15332,11 +15332,11 @@
hash
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509err.h
@@ -15376,11 +15376,11 @@
hash
- gd7rWr8OhyDXUVClEo5R5CxFUjQ=
+ RujmUhI9pGkvC2ffIjcIJJ7xTBA=
hash2
- cQVcZDXk2qpQ8Dn4tYmsb2pZ+6YIm3rJzD3kzEtrSM4=
+ EHUMPa4I/bL4xygfXy8DkHRRo+rk2AfLppeHxixTY7g=
tvos-arm64_x86_64-simulator/OpenSSL.framework/Modules/module.modulemap
@@ -15398,11 +15398,11 @@
hash
- cVV2aKrAO0bY8Qv7kIfqwOV5+XU=
+ 9E++9WNEj+TbE0uJP8nOTAhHl/4=
hash2
- 0wmn2cImRPOBRPu/Xcgk5fM5z9fqePzD9fq/NUZe+Ik=
+ MNJvWx73CYVPeFw7S5I9eYCijH2UUnLj0tqgB8j2LSU=
tvos-arm64_x86_64-simulator/OpenSSL.framework/PrivacyInfo.xcprivacy
@@ -15420,11 +15420,11 @@
hash
- 4Zk2Yw2gG2t+9OksayZGVL5EP5I=
+ +Qg7DKkZDQ0KJpBfLiMQwm3/G74=
hash2
- 2BU7EnR/yhQ9R09fuZJPFwWTpK8P2IpY+SWobfEeP3A=
+ o9g024JrwaXBBrFamhb7iknxOpoC6dypqmWL2QmNSD4=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/OpenSSL.h
@@ -15464,11 +15464,11 @@
hash
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/asn1t.h
@@ -15508,11 +15508,11 @@
hash
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/bioerr.h
@@ -15618,11 +15618,11 @@
hash
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/cmp_util.h
@@ -15640,11 +15640,11 @@
hash
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/cms.h
@@ -15695,11 +15695,11 @@
hash
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/conf_api.h
@@ -15728,11 +15728,11 @@
hash
- mp4WLl5nQWdzgpf97VWrQ5tGnbY=
+ 2105ELXL7WvSfSB26S9l/juILmg=
hash2
- IpHQkJF4VaqWvnjuBwDTpgPit005UE7TD1zcMBHXGV0=
+ GzGZPhjWponkERprdtYtXJ3Qe5xq4pjL32P/iKMmkTQ=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/conftypes.h
@@ -15761,22 +15761,22 @@
hash
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/core_names.h
hash
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/core_object.h
@@ -15904,11 +15904,11 @@
hash
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/dherr.h
@@ -16080,11 +16080,11 @@
hash
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/ess.h
@@ -16113,11 +16113,11 @@
hash
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/evperr.h
@@ -16168,33 +16168,33 @@
hash
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/http.h
hash
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/httperr.h
hash
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/idea.h
@@ -16234,11 +16234,11 @@
hash
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/macros.h
@@ -16311,11 +16311,11 @@
hash
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/objects.h
@@ -16377,11 +16377,11 @@
hash
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/ossl_typ.h
@@ -16476,11 +16476,11 @@
hash
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/pkcs7err.h
@@ -16531,11 +16531,11 @@
hash
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/rand.h
@@ -16652,11 +16652,11 @@
hash
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/sha.h
@@ -16707,11 +16707,11 @@
hash
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/ssl2.h
@@ -16740,22 +16740,22 @@
hash
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/sslerr_legacy.h
hash
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/stack.h
@@ -16927,11 +16927,11 @@
hash
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/x509err.h
@@ -16971,11 +16971,11 @@
hash
- WsRRl8h68x1Yl3IxQopDVCxzZAM=
+ W9oyX9WV39Z79V9nzFllt5GEQzg=
hash2
- OWMfecToWvQr7yA6X6CUavuRO1mr9ppQAZFfDV6qfZs=
+ 7EvEV+0R42VkzTeCq3Ovhj2G++s2Zh6VAK9mcV+NnIo=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Modules/module.modulemap
@@ -16993,11 +16993,11 @@
hash
- Z1/jv/bLilofslm6qhQIfU8x9nc=
+ EKbjqyRkc2QtO5V29uwhZliW1WU=
hash2
- ZZ0rBr+Iducb/qFkBAYe2FZkrsUoO+rAC/JiHAnmep4=
+ vAYkr/4ds0fdU//OJZlW6fZP8+aNlGikbh3NFDJDutc=
watchos-arm64_arm64_32_armv7k/OpenSSL.framework/PrivacyInfo.xcprivacy
@@ -17015,11 +17015,11 @@
hash
- NW2synqq1hfrFw4e5LrNHAKk7Jk=
+ cudZOh2ccY7ARzXYxyDhwbbos5M=
hash2
- 1CMyGxIxvZr5pq3DlYlkMgvQAxyzkVxYqE+jFTHgvps=
+ /sWxaYwrL2Ca5VRlhmDanAccIei+b7HaLG4yTheW/rg=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/OpenSSL.h
@@ -17059,11 +17059,11 @@
hash
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1t.h
@@ -17103,11 +17103,11 @@
hash
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/bioerr.h
@@ -17213,11 +17213,11 @@
hash
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp_util.h
@@ -17235,11 +17235,11 @@
hash
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cms.h
@@ -17290,11 +17290,11 @@
hash
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf_api.h
@@ -17323,11 +17323,11 @@
hash
- mp4WLl5nQWdzgpf97VWrQ5tGnbY=
+ 2105ELXL7WvSfSB26S9l/juILmg=
hash2
- IpHQkJF4VaqWvnjuBwDTpgPit005UE7TD1zcMBHXGV0=
+ GzGZPhjWponkERprdtYtXJ3Qe5xq4pjL32P/iKMmkTQ=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conftypes.h
@@ -17356,22 +17356,22 @@
hash
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
hash
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_object.h
@@ -17499,11 +17499,11 @@
hash
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/dherr.h
@@ -17675,11 +17675,11 @@
hash
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ess.h
@@ -17708,11 +17708,11 @@
hash
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/evperr.h
@@ -17763,33 +17763,33 @@
hash
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
hash
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
hash
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/idea.h
@@ -17829,11 +17829,11 @@
hash
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/macros.h
@@ -17906,11 +17906,11 @@
hash
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/objects.h
@@ -17972,11 +17972,11 @@
hash
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ossl_typ.h
@@ -18071,11 +18071,11 @@
hash
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7err.h
@@ -18126,11 +18126,11 @@
hash
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/rand.h
@@ -18247,11 +18247,11 @@
hash
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sha.h
@@ -18302,11 +18302,11 @@
hash
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl2.h
@@ -18335,22 +18335,22 @@
hash
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
hash
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/stack.h
@@ -18522,11 +18522,11 @@
hash
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509err.h
@@ -18566,11 +18566,11 @@
hash
- HLzm/NeSNfFVhCsA8UzYIsaUqHM=
+ BaBjJFDy/wmh+4hCtvTo+wR8/t4=
hash2
- zh4IYk9shXSHqrlEkGJ6RGB9JiFll+LfF9qAyfk/k/s=
+ VAk4yNwgEk8qCQYC5q69+dpRK3hg1c8VS8cOTLjA41A=
watchos-arm64_x86_64-simulator/OpenSSL.framework/Modules/module.modulemap
@@ -18588,11 +18588,11 @@
hash
- Js75VAcaY86wGetSiwdzgCTb+yw=
+ EuZQWGQtthYXV/JHO0hP+RJiv2Y=
hash2
- huIvx4jEXxlHop2YA8/UEOOfGq1gXG2M1ztxWdd2/3w=
+ rtgqFs3UpT1UNN4OUyE2RMjDWp+zigL28JXI23Fb3wI=
watchos-arm64_x86_64-simulator/OpenSSL.framework/PrivacyInfo.xcprivacy
@@ -18610,11 +18610,11 @@
hash
- vjgXs87TkvGD3NE/5/BYke8Cdx0=
+ WxS3IS8S6+BQV+5v3HTac4NcpmY=
hash2
- nv2c79u5D0TwtZ/Wg4PcI/tiAGcNvAkJeUjA5DP79Cc=
+ Ktu5dZwbQ8EK5Xn65r3lIf+coB5JND8iNj+8hxSTDCk=
xros-arm64/OpenSSL.framework/Headers/OpenSSL.h
@@ -18654,11 +18654,11 @@
hash
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
xros-arm64/OpenSSL.framework/Headers/asn1t.h
@@ -18698,11 +18698,11 @@
hash
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
xros-arm64/OpenSSL.framework/Headers/bioerr.h
@@ -18808,11 +18808,11 @@
hash
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
xros-arm64/OpenSSL.framework/Headers/cmp_util.h
@@ -18830,11 +18830,11 @@
hash
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
xros-arm64/OpenSSL.framework/Headers/cms.h
@@ -18885,11 +18885,11 @@
hash
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
xros-arm64/OpenSSL.framework/Headers/conf_api.h
@@ -18918,11 +18918,11 @@
hash
- yjr15PIOf/CqzXE+85wawHh2fs8=
+ QHnJsrU4bBKEKavpabchMyFg1qw=
hash2
- kQ0lT9tiBDKsIi568LOmHyQmGYb3fv0zm5pkr4ipmEQ=
+ /1F1LK3Okl498njz5uYoJsQbFIfRsnc9SBHVh4neOaA=
xros-arm64/OpenSSL.framework/Headers/conftypes.h
@@ -18951,22 +18951,22 @@
hash
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
xros-arm64/OpenSSL.framework/Headers/core_names.h
hash
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
xros-arm64/OpenSSL.framework/Headers/core_object.h
@@ -19094,11 +19094,11 @@
hash
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
xros-arm64/OpenSSL.framework/Headers/dherr.h
@@ -19270,11 +19270,11 @@
hash
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
xros-arm64/OpenSSL.framework/Headers/ess.h
@@ -19303,11 +19303,11 @@
hash
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
xros-arm64/OpenSSL.framework/Headers/evperr.h
@@ -19358,33 +19358,33 @@
hash
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
xros-arm64/OpenSSL.framework/Headers/http.h
hash
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
xros-arm64/OpenSSL.framework/Headers/httperr.h
hash
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
xros-arm64/OpenSSL.framework/Headers/idea.h
@@ -19424,11 +19424,11 @@
hash
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
xros-arm64/OpenSSL.framework/Headers/macros.h
@@ -19501,11 +19501,11 @@
hash
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
xros-arm64/OpenSSL.framework/Headers/objects.h
@@ -19567,11 +19567,11 @@
hash
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
xros-arm64/OpenSSL.framework/Headers/ossl_typ.h
@@ -19666,11 +19666,11 @@
hash
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
xros-arm64/OpenSSL.framework/Headers/pkcs7err.h
@@ -19721,11 +19721,11 @@
hash
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
xros-arm64/OpenSSL.framework/Headers/rand.h
@@ -19842,11 +19842,11 @@
hash
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
xros-arm64/OpenSSL.framework/Headers/sha.h
@@ -19897,11 +19897,11 @@
hash
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
xros-arm64/OpenSSL.framework/Headers/ssl2.h
@@ -19930,22 +19930,22 @@
hash
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
xros-arm64/OpenSSL.framework/Headers/sslerr_legacy.h
hash
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
xros-arm64/OpenSSL.framework/Headers/stack.h
@@ -20117,11 +20117,11 @@
hash
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
xros-arm64/OpenSSL.framework/Headers/x509err.h
@@ -20161,11 +20161,11 @@
hash
- bah+ENbAp1Hpqi3etWGe3quZea0=
+ /XbqrrnFkhc9Trgp5hE4N03KGbI=
hash2
- ZXUi3a0lzOUncL/oI+shKT2KEc+Gr3druuSfR0JnbRw=
+ 2UWNXlJxEzewX312gFgELLAo6aQOKB//SCwht0Mtz8w=
xros-arm64/OpenSSL.framework/Modules/module.modulemap
@@ -20183,11 +20183,11 @@
hash
- uyymGMp16tTb2784jGasLFclgcQ=
+ YWQ0YruvWa8K4Rcwq6glLGSpO7A=
hash2
- bokENjBojCMlbMZXAgmF5BEimBA2LsS3vMXx52at0jI=
+ yRL8pC/P8XJyevAaNac9dfyl6Abq58DwC3V4ypOwg9U=
xros-arm64/OpenSSL.framework/PrivacyInfo.xcprivacy
@@ -20205,11 +20205,11 @@
hash
- 2dBykbxAEg2+Lru1wHo619dMqmw=
+ bNhaIOtpvHof1CDtbQS5c/x6+pY=
hash2
- lM7Zw2CaeyAdtrN/AWmcOtID8Ye6FnuU4JsNar+0b5A=
+ 9HdAyerMOqf5uT/mSFQdE9tIhFTC3ZzaQQ7+OEK8l9g=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/OpenSSL.h
@@ -20249,11 +20249,11 @@
hash
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1t.h
@@ -20293,11 +20293,11 @@
hash
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/bioerr.h
@@ -20403,11 +20403,11 @@
hash
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp_util.h
@@ -20425,11 +20425,11 @@
hash
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/cms.h
@@ -20480,11 +20480,11 @@
hash
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf_api.h
@@ -20513,11 +20513,11 @@
hash
- yjr15PIOf/CqzXE+85wawHh2fs8=
+ QHnJsrU4bBKEKavpabchMyFg1qw=
hash2
- kQ0lT9tiBDKsIi568LOmHyQmGYb3fv0zm5pkr4ipmEQ=
+ /1F1LK3Okl498njz5uYoJsQbFIfRsnc9SBHVh4neOaA=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/conftypes.h
@@ -20546,22 +20546,22 @@
hash
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
hash
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_object.h
@@ -20689,11 +20689,11 @@
hash
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/dherr.h
@@ -20865,11 +20865,11 @@
hash
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/ess.h
@@ -20898,11 +20898,11 @@
hash
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/evperr.h
@@ -20953,33 +20953,33 @@
hash
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
hash
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
hash
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/idea.h
@@ -21019,11 +21019,11 @@
hash
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/macros.h
@@ -21096,11 +21096,11 @@
hash
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/objects.h
@@ -21162,11 +21162,11 @@
hash
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/ossl_typ.h
@@ -21261,11 +21261,11 @@
hash
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7err.h
@@ -21316,11 +21316,11 @@
hash
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/rand.h
@@ -21437,11 +21437,11 @@
hash
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/sha.h
@@ -21492,11 +21492,11 @@
hash
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl2.h
@@ -21525,22 +21525,22 @@
hash
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
hash
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/stack.h
@@ -21712,11 +21712,11 @@
hash
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509err.h
@@ -21756,11 +21756,11 @@
hash
- JNDlylPmM0ICLugnp7oBSPEc+I0=
+ gfVRBzQuHVlKIE3HAhPmhpt8z7g=
hash2
- iJ5cRP6sq2jWWgRB4Ua97PvGaBV4YH7Wm9E8Ntrjm5g=
+ SFtw65E7kgmkfOGYZwQIeAwhTON/rZHp4tEp1vfEkm0=
xros-arm64_x86_64-simulator/OpenSSL.framework/Modules/module.modulemap
@@ -21778,11 +21778,11 @@
hash
- ZtAv+X5o8mZ9ynkghcyygulEyWI=
+ 6a6hSSpSM/Dvyeu5Xnz5ZzTdaqQ=
hash2
- wq8oj2/EEFEfZ4IvPqY1cUClhL9bKlgp1nk6PyGoawA=
+ zuA7EktTBrTlWyUCeHNqvuaUQN5OT0HIlgHxDeeBbeY=
xros-arm64_x86_64-simulator/OpenSSL.framework/PrivacyInfo.xcprivacy
@@ -21800,11 +21800,11 @@
hash
- JpugKEilXXUy158vYwyBom/CX8Q=
+ nKQC+b8gu3cOxpe0RscFuCBj5XM=
hash2
- nowMDL2ghnQFo1ZQJfDnEUAKPibgq9EKrm9fmpW1Ork=
+ p6qkOXKCwPNcyMRA+9Dw6YiHocmhGxvg651iCug+sD4=
diff --git a/Frameworks/OpenSSL.xcframework/_CodeSignature/CodeSignature b/Frameworks/OpenSSL.xcframework/_CodeSignature/CodeSignature
index 8e73d125..f63cd661 100644
Binary files a/Frameworks/OpenSSL.xcframework/_CodeSignature/CodeSignature and b/Frameworks/OpenSSL.xcframework/_CodeSignature/CodeSignature differ
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/asn1err.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/asn1err.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/bio.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/bio.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/cmp.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/cmp.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/cmperr.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/cmperr.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/conf.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/conf.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/configuration.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/configuration.h
index 09071376..1dacd74f 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/configuration.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_iOS
# define OPENSSL_SYS_iOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/core_dispatch.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/core_dispatch.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/core_names.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/core_names.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/dh.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/dh.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/err.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/err.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/evp.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/evp.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/hpke.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/hpke.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/http.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/http.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/httperr.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/httperr.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/lhash.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/lhash.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/obj_mac.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/obj_mac.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/opensslv.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/opensslv.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/pkcs7.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/pkcs7.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/quic.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/quic.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/self_test.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/self_test.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/ssl.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/ssl.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/sslerr.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/sslerr.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/sslerr_legacy.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/sslerr_legacy.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/x509_vfy.h b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/x509_vfy.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Info.plist b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Info.plist
index df714eec..7fdcc31f 100644
Binary files a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Info.plist and b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/Info.plist differ
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/OpenSSL b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/OpenSSL
index 1ead36f9..feddcc8e 100755
Binary files a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/OpenSSL and b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/OpenSSL differ
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/_CodeSignature/CodeResources
index 79e5f552..e70e8a48 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/_CodeSignature/CodeResources
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64/OpenSSL.framework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
Headers/asn1t.h
@@ -34,7 +34,7 @@
Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
Headers/bioerr.h
@@ -74,7 +74,7 @@
Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
Headers/cmp_util.h
@@ -82,7 +82,7 @@
Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
Headers/cms.h
@@ -102,7 +102,7 @@
Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
Headers/conf_api.h
@@ -114,7 +114,7 @@
Headers/configuration.h
- ia9Lq9Ma5Kl0sdwkNFmHsS3OUkU=
+ MFiooVP1OE4028WfQZREAH2Ma64=
Headers/conftypes.h
@@ -126,11 +126,11 @@
Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
Headers/core_object.h
@@ -178,7 +178,7 @@
Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
Headers/dherr.h
@@ -242,7 +242,7 @@
Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
Headers/ess.h
@@ -254,7 +254,7 @@
Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
Headers/evperr.h
@@ -274,15 +274,15 @@
Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
Headers/idea.h
@@ -298,7 +298,7 @@
Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
Headers/macros.h
@@ -326,7 +326,7 @@
Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
Headers/objects.h
@@ -350,7 +350,7 @@
Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
Headers/ossl_typ.h
@@ -386,7 +386,7 @@
Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
Headers/pkcs7err.h
@@ -406,7 +406,7 @@
Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
Headers/rand.h
@@ -450,7 +450,7 @@
Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
Headers/sha.h
@@ -470,7 +470,7 @@
Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
Headers/ssl2.h
@@ -482,11 +482,11 @@
Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
Headers/stack.h
@@ -550,7 +550,7 @@
Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
Headers/x509err.h
@@ -566,7 +566,7 @@
Info.plist
- QrYuUiaf0eAsvjMGE/3sfZCnj4w=
+ 0M5H0ChbB+HbzSq0fxnVTEuStwM=
Modules/module.modulemap
@@ -604,7 +604,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -632,7 +632,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -702,7 +702,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -716,7 +716,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -751,7 +751,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -772,7 +772,7 @@
hash2
- U+oCGPKn5mmjbIJuiM9+qxL6r+Nyru/o9FRYnKGxn88=
+ nYZRBqi1sSU1SGq1+GEl+ZtOkMzUzBwMp4jmSNG+gF4=
Headers/conftypes.h
@@ -793,14 +793,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -884,7 +884,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -996,7 +996,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -1017,7 +1017,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -1052,21 +1052,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -1094,7 +1094,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -1143,7 +1143,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -1185,7 +1185,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -1248,7 +1248,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -1283,7 +1283,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -1360,7 +1360,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -1395,7 +1395,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -1416,14 +1416,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -1535,7 +1535,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/asn1err.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/asn1err.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/bio.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/bio.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/cmp.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/cmp.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/cmperr.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/cmperr.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/conf.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/conf.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/configuration.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/configuration.h
index 9eac98ec..775e0c38 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/configuration.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_MacOSX
# define OPENSSL_SYS_MacOSX 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/core_dispatch.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/core_dispatch.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/core_names.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/core_names.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/dh.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/dh.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/err.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/err.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/evp.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/evp.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/hpke.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/hpke.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/http.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/http.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/httperr.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/httperr.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/lhash.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/lhash.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/obj_mac.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/obj_mac.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/opensslv.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/opensslv.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/pkcs7.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/pkcs7.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/quic.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/quic.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/self_test.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/self_test.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/ssl.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/ssl.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/sslerr.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/sslerr.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/x509_vfy.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/x509_vfy.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/OpenSSL b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/OpenSSL
index 1065a5b9..fefea833 100755
Binary files a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/OpenSSL and b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/OpenSSL differ
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Resources/Info.plist b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Resources/Info.plist
index 2a79dc8f..941acfe9 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Resources/Info.plist
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/Resources/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 3.2.2000
+ 3.3.1000
CFBundleSupportedPlatforms
MacOSX
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources
index 1e983872..4a7383d7 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-maccatalyst/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources
@@ -6,7 +6,7 @@
Resources/Info.plist
- locKjucac2EJ89FRFaQ2fAquWYc=
+ 5W0vEiZk7ITLhx3QF5fsQmDSSNc=
Resources/PrivacyInfo.xcprivacy
@@ -40,7 +40,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -68,7 +68,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -138,7 +138,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -152,7 +152,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -187,7 +187,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -208,7 +208,7 @@
hash2
- +jfF9b6H8IHvka44tRlIBPNUCGZJHt5pUyvP/gzKB1U=
+ vPsBXnSq792SdhY8trfuMoDoG/ngWckXRzIMy71iz4Q=
Headers/conftypes.h
@@ -229,14 +229,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -320,7 +320,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -432,7 +432,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -453,7 +453,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -488,21 +488,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -530,7 +530,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -579,7 +579,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -621,7 +621,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -684,7 +684,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -719,7 +719,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -796,7 +796,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -831,7 +831,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -852,14 +852,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -971,7 +971,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
@@ -1006,7 +1006,7 @@
hash2
- ez/Aj0H33BcLqRgrYn5ICQTTXnbR7jOS5WgmhhjSVUg=
+ VcU7auj9ICh7uMZaOAU/f692zrBm9+U0FO4t+jnHU8g=
Resources/PrivacyInfo.xcprivacy
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h
index 09071376..1dacd74f 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_iOS
# define OPENSSL_SYS_iOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Info.plist b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Info.plist
index a536f4bb..555a1a47 100644
Binary files a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Info.plist and b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/Info.plist differ
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL
index d5d69022..5a86e511 100755
Binary files a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL and b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL differ
diff --git a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources
index b5ffae67..14664b9d 100644
--- a/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources
+++ b/Frameworks/OpenSSL.xcframework/ios-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
Headers/asn1t.h
@@ -34,7 +34,7 @@
Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
Headers/bioerr.h
@@ -74,7 +74,7 @@
Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
Headers/cmp_util.h
@@ -82,7 +82,7 @@
Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
Headers/cms.h
@@ -102,7 +102,7 @@
Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
Headers/conf_api.h
@@ -114,7 +114,7 @@
Headers/configuration.h
- ia9Lq9Ma5Kl0sdwkNFmHsS3OUkU=
+ MFiooVP1OE4028WfQZREAH2Ma64=
Headers/conftypes.h
@@ -126,11 +126,11 @@
Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
Headers/core_object.h
@@ -178,7 +178,7 @@
Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
Headers/dherr.h
@@ -242,7 +242,7 @@
Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
Headers/ess.h
@@ -254,7 +254,7 @@
Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
Headers/evperr.h
@@ -274,15 +274,15 @@
Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
Headers/idea.h
@@ -298,7 +298,7 @@
Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
Headers/macros.h
@@ -326,7 +326,7 @@
Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
Headers/objects.h
@@ -350,7 +350,7 @@
Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
Headers/ossl_typ.h
@@ -386,7 +386,7 @@
Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
Headers/pkcs7err.h
@@ -406,7 +406,7 @@
Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
Headers/rand.h
@@ -450,7 +450,7 @@
Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
Headers/sha.h
@@ -470,7 +470,7 @@
Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
Headers/ssl2.h
@@ -482,11 +482,11 @@
Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
Headers/stack.h
@@ -550,7 +550,7 @@
Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
Headers/x509err.h
@@ -566,7 +566,7 @@
Info.plist
- Wx0Sw4H53tuW3NqecVlInMDXno4=
+ 1fmnrzc1+fTlJCB5QahopmxgsCE=
Modules/module.modulemap
@@ -604,7 +604,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -632,7 +632,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -702,7 +702,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -716,7 +716,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -751,7 +751,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -772,7 +772,7 @@
hash2
- U+oCGPKn5mmjbIJuiM9+qxL6r+Nyru/o9FRYnKGxn88=
+ nYZRBqi1sSU1SGq1+GEl+ZtOkMzUzBwMp4jmSNG+gF4=
Headers/conftypes.h
@@ -793,14 +793,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -884,7 +884,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -996,7 +996,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -1017,7 +1017,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -1052,21 +1052,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -1094,7 +1094,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -1143,7 +1143,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -1185,7 +1185,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -1248,7 +1248,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -1283,7 +1283,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -1360,7 +1360,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -1395,7 +1395,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -1416,14 +1416,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -1535,7 +1535,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/asn1err.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/asn1err.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/bio.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/bio.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/cmp.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/cmp.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/cmperr.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/cmperr.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/conf.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/conf.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/configuration.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/configuration.h
index 9eac98ec..775e0c38 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/configuration.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_MacOSX
# define OPENSSL_SYS_MacOSX 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/core_dispatch.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/core_dispatch.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/core_names.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/core_names.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/dh.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/dh.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/err.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/err.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/evp.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/evp.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/hpke.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/hpke.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/http.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/http.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/httperr.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/httperr.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/lhash.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/lhash.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/obj_mac.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/obj_mac.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/opensslv.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/opensslv.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/pkcs7.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/pkcs7.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/quic.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/quic.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/self_test.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/self_test.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/ssl.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/ssl.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/sslerr.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/sslerr.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/x509_vfy.h b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/x509_vfy.h
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/OpenSSL b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/OpenSSL
index 4bb27c47..302ed2da 100755
Binary files a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/OpenSSL and b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/OpenSSL differ
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Resources/Info.plist b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Resources/Info.plist
index 5c5ffe87..75d14e2c 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Resources/Info.plist
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/Resources/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 3.2.2000
+ 3.3.1000
CFBundleSupportedPlatforms
MacOSX
diff --git a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources
index 649dc7a4..7b8df78e 100644
--- a/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources
+++ b/Frameworks/OpenSSL.xcframework/macos-arm64_x86_64/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources
@@ -6,7 +6,7 @@
Resources/Info.plist
- ygSh/JNcojZ+defoLJ/ubUODJLc=
+ RVfpW11pj5w5M5ZTL/SkqGynaN8=
Resources/PrivacyInfo.xcprivacy
@@ -40,7 +40,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -68,7 +68,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -138,7 +138,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -152,7 +152,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -187,7 +187,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -208,7 +208,7 @@
hash2
- +jfF9b6H8IHvka44tRlIBPNUCGZJHt5pUyvP/gzKB1U=
+ vPsBXnSq792SdhY8trfuMoDoG/ngWckXRzIMy71iz4Q=
Headers/conftypes.h
@@ -229,14 +229,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -320,7 +320,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -432,7 +432,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -453,7 +453,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -488,21 +488,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -530,7 +530,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -579,7 +579,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -621,7 +621,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -684,7 +684,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -719,7 +719,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -796,7 +796,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -831,7 +831,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -852,14 +852,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -971,7 +971,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
@@ -1006,7 +1006,7 @@
hash2
- X+T9j5rz5orbYzukuy7H2TfiCOx9yj/t2Vxn7bcwYwg=
+ 3F/RwVsnL4REPwj/FLKyYJA3570XliTO/lTmKe/HzQM=
Resources/PrivacyInfo.xcprivacy
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/asn1err.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/asn1err.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/bio.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/bio.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/cmp.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/cmp.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/cmperr.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/cmperr.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/conf.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/conf.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/configuration.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/configuration.h
index e53c0dac..ec23fdc0 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/configuration.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_tvOS
# define OPENSSL_SYS_tvOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/core_dispatch.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/core_dispatch.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/core_names.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/core_names.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/dh.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/dh.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/err.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/err.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/evp.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/evp.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/hpke.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/hpke.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/http.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/http.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/httperr.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/httperr.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/lhash.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/lhash.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/obj_mac.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/obj_mac.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/opensslv.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/opensslv.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/pkcs7.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/pkcs7.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/quic.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/quic.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/self_test.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/self_test.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/ssl.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/ssl.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/sslerr.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/sslerr.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/sslerr_legacy.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/sslerr_legacy.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/x509_vfy.h b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/x509_vfy.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Info.plist b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Info.plist
index 47917f5a..55b2b421 100644
Binary files a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Info.plist and b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/Info.plist differ
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/OpenSSL b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/OpenSSL
index a192b9b4..131af151 100755
Binary files a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/OpenSSL and b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/OpenSSL differ
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/_CodeSignature/CodeResources
index 11bdded8..f1860b37 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/_CodeSignature/CodeResources
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64/OpenSSL.framework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
Headers/asn1t.h
@@ -34,7 +34,7 @@
Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
Headers/bioerr.h
@@ -74,7 +74,7 @@
Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
Headers/cmp_util.h
@@ -82,7 +82,7 @@
Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
Headers/cms.h
@@ -102,7 +102,7 @@
Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
Headers/conf_api.h
@@ -114,7 +114,7 @@
Headers/configuration.h
- 31BE8LwRUj29KzYtu8s7CYNvvoY=
+ uq6EBUgROXJefAoIu8jjfcdUMSg=
Headers/conftypes.h
@@ -126,11 +126,11 @@
Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
Headers/core_object.h
@@ -178,7 +178,7 @@
Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
Headers/dherr.h
@@ -242,7 +242,7 @@
Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
Headers/ess.h
@@ -254,7 +254,7 @@
Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
Headers/evperr.h
@@ -274,15 +274,15 @@
Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
Headers/idea.h
@@ -298,7 +298,7 @@
Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
Headers/macros.h
@@ -326,7 +326,7 @@
Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
Headers/objects.h
@@ -350,7 +350,7 @@
Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
Headers/ossl_typ.h
@@ -386,7 +386,7 @@
Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
Headers/pkcs7err.h
@@ -406,7 +406,7 @@
Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
Headers/rand.h
@@ -450,7 +450,7 @@
Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
Headers/sha.h
@@ -470,7 +470,7 @@
Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
Headers/ssl2.h
@@ -482,11 +482,11 @@
Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
Headers/stack.h
@@ -550,7 +550,7 @@
Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
Headers/x509err.h
@@ -566,7 +566,7 @@
Info.plist
- +KCnD2Ok5EzpN+IJyljnRpZaVNw=
+ 8A79UJgte5+L5td+gODvDoGGl8I=
Modules/module.modulemap
@@ -604,7 +604,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -632,7 +632,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -702,7 +702,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -716,7 +716,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -751,7 +751,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -772,7 +772,7 @@
hash2
- ER9xEddHqSW07OKwxmxDF6wnf3kxWVZk/1pXhWOkMRg=
+ 0xjQLhfP7NnFyVR7Zyunl/Vf475YpuuV5M/sNQckdd0=
Headers/conftypes.h
@@ -793,14 +793,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -884,7 +884,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -996,7 +996,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -1017,7 +1017,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -1052,21 +1052,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -1094,7 +1094,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -1143,7 +1143,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -1185,7 +1185,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -1248,7 +1248,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -1283,7 +1283,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -1360,7 +1360,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -1395,7 +1395,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -1416,14 +1416,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -1535,7 +1535,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h
index e53c0dac..ec23fdc0 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_tvOS
# define OPENSSL_SYS_tvOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Info.plist b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Info.plist
index dbbb02ac..0612ec33 100644
Binary files a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Info.plist and b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/Info.plist differ
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL
index c271073a..d6eeed56 100755
Binary files a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL and b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL differ
diff --git a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources
index aea24d78..170e3e44 100644
--- a/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources
+++ b/Frameworks/OpenSSL.xcframework/tvos-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
Headers/asn1t.h
@@ -34,7 +34,7 @@
Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
Headers/bioerr.h
@@ -74,7 +74,7 @@
Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
Headers/cmp_util.h
@@ -82,7 +82,7 @@
Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
Headers/cms.h
@@ -102,7 +102,7 @@
Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
Headers/conf_api.h
@@ -114,7 +114,7 @@
Headers/configuration.h
- 31BE8LwRUj29KzYtu8s7CYNvvoY=
+ uq6EBUgROXJefAoIu8jjfcdUMSg=
Headers/conftypes.h
@@ -126,11 +126,11 @@
Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
Headers/core_object.h
@@ -178,7 +178,7 @@
Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
Headers/dherr.h
@@ -242,7 +242,7 @@
Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
Headers/ess.h
@@ -254,7 +254,7 @@
Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
Headers/evperr.h
@@ -274,15 +274,15 @@
Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
Headers/idea.h
@@ -298,7 +298,7 @@
Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
Headers/macros.h
@@ -326,7 +326,7 @@
Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
Headers/objects.h
@@ -350,7 +350,7 @@
Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
Headers/ossl_typ.h
@@ -386,7 +386,7 @@
Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
Headers/pkcs7err.h
@@ -406,7 +406,7 @@
Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
Headers/rand.h
@@ -450,7 +450,7 @@
Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
Headers/sha.h
@@ -470,7 +470,7 @@
Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
Headers/ssl2.h
@@ -482,11 +482,11 @@
Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
Headers/stack.h
@@ -550,7 +550,7 @@
Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
Headers/x509err.h
@@ -566,7 +566,7 @@
Info.plist
- gd7rWr8OhyDXUVClEo5R5CxFUjQ=
+ RujmUhI9pGkvC2ffIjcIJJ7xTBA=
Modules/module.modulemap
@@ -604,7 +604,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -632,7 +632,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -702,7 +702,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -716,7 +716,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -751,7 +751,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -772,7 +772,7 @@
hash2
- ER9xEddHqSW07OKwxmxDF6wnf3kxWVZk/1pXhWOkMRg=
+ 0xjQLhfP7NnFyVR7Zyunl/Vf475YpuuV5M/sNQckdd0=
Headers/conftypes.h
@@ -793,14 +793,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -884,7 +884,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -996,7 +996,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -1017,7 +1017,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -1052,21 +1052,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -1094,7 +1094,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -1143,7 +1143,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -1185,7 +1185,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -1248,7 +1248,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -1283,7 +1283,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -1360,7 +1360,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -1395,7 +1395,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -1416,14 +1416,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -1535,7 +1535,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/asn1err.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/asn1err.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/bio.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/bio.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/cmp.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/cmp.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/cmperr.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/cmperr.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/conf.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/conf.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/configuration.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/configuration.h
index 2e2e7246..ccd77db9 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/configuration.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_watchOS
# define OPENSSL_SYS_watchOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/core_dispatch.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/core_dispatch.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/core_names.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/core_names.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/dh.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/dh.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/err.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/err.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/evp.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/evp.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/hpke.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/hpke.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/http.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/http.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/httperr.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/httperr.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/lhash.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/lhash.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/obj_mac.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/obj_mac.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/opensslv.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/opensslv.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/pkcs7.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/pkcs7.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/quic.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/quic.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/self_test.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/self_test.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/ssl.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/ssl.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/sslerr.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/sslerr.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/sslerr_legacy.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/sslerr_legacy.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/x509_vfy.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/x509_vfy.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Info.plist b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Info.plist
index 7ae8585c..3bebab2c 100644
Binary files a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Info.plist and b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/Info.plist differ
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/OpenSSL b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/OpenSSL
index 3aed3e4e..0e33f245 100755
Binary files a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/OpenSSL and b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/OpenSSL differ
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/_CodeSignature/CodeResources
index cd1e626c..a07e2e72 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/_CodeSignature/CodeResources
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_arm64_32_armv7k/OpenSSL.framework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
Headers/asn1t.h
@@ -34,7 +34,7 @@
Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
Headers/bioerr.h
@@ -74,7 +74,7 @@
Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
Headers/cmp_util.h
@@ -82,7 +82,7 @@
Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
Headers/cms.h
@@ -102,7 +102,7 @@
Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
Headers/conf_api.h
@@ -114,7 +114,7 @@
Headers/configuration.h
- mp4WLl5nQWdzgpf97VWrQ5tGnbY=
+ 2105ELXL7WvSfSB26S9l/juILmg=
Headers/conftypes.h
@@ -126,11 +126,11 @@
Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
Headers/core_object.h
@@ -178,7 +178,7 @@
Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
Headers/dherr.h
@@ -242,7 +242,7 @@
Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
Headers/ess.h
@@ -254,7 +254,7 @@
Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
Headers/evperr.h
@@ -274,15 +274,15 @@
Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
Headers/idea.h
@@ -298,7 +298,7 @@
Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
Headers/macros.h
@@ -326,7 +326,7 @@
Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
Headers/objects.h
@@ -350,7 +350,7 @@
Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
Headers/ossl_typ.h
@@ -386,7 +386,7 @@
Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
Headers/pkcs7err.h
@@ -406,7 +406,7 @@
Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
Headers/rand.h
@@ -450,7 +450,7 @@
Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
Headers/sha.h
@@ -470,7 +470,7 @@
Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
Headers/ssl2.h
@@ -482,11 +482,11 @@
Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
Headers/stack.h
@@ -550,7 +550,7 @@
Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
Headers/x509err.h
@@ -566,7 +566,7 @@
Info.plist
- WsRRl8h68x1Yl3IxQopDVCxzZAM=
+ W9oyX9WV39Z79V9nzFllt5GEQzg=
Modules/module.modulemap
@@ -616,11 +616,11 @@
hash
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -660,11 +660,11 @@
hash
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -770,11 +770,11 @@
hash
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -792,11 +792,11 @@
hash
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -847,11 +847,11 @@
hash
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -880,11 +880,11 @@
hash
- mp4WLl5nQWdzgpf97VWrQ5tGnbY=
+ 2105ELXL7WvSfSB26S9l/juILmg=
hash2
- IpHQkJF4VaqWvnjuBwDTpgPit005UE7TD1zcMBHXGV0=
+ GzGZPhjWponkERprdtYtXJ3Qe5xq4pjL32P/iKMmkTQ=
Headers/conftypes.h
@@ -913,22 +913,22 @@
hash
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -1056,11 +1056,11 @@
hash
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -1232,11 +1232,11 @@
hash
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -1265,11 +1265,11 @@
hash
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -1320,33 +1320,33 @@
hash
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -1386,11 +1386,11 @@
hash
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -1463,11 +1463,11 @@
hash
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -1529,11 +1529,11 @@
hash
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -1628,11 +1628,11 @@
hash
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -1683,11 +1683,11 @@
hash
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -1804,11 +1804,11 @@
hash
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -1859,11 +1859,11 @@
hash
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -1892,22 +1892,22 @@
hash
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -2079,11 +2079,11 @@
hash
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h
index 2e2e7246..ccd77db9 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_watchOS
# define OPENSSL_SYS_watchOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Info.plist b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Info.plist
index d200789f..d930707e 100644
Binary files a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Info.plist and b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/Info.plist differ
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL
index 60376eab..617b4438 100755
Binary files a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL and b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL differ
diff --git a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources
index 4459eb91..a994d895 100644
--- a/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources
+++ b/Frameworks/OpenSSL.xcframework/watchos-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
Headers/asn1t.h
@@ -34,7 +34,7 @@
Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
Headers/bioerr.h
@@ -74,7 +74,7 @@
Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
Headers/cmp_util.h
@@ -82,7 +82,7 @@
Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
Headers/cms.h
@@ -102,7 +102,7 @@
Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
Headers/conf_api.h
@@ -114,7 +114,7 @@
Headers/configuration.h
- mp4WLl5nQWdzgpf97VWrQ5tGnbY=
+ 2105ELXL7WvSfSB26S9l/juILmg=
Headers/conftypes.h
@@ -126,11 +126,11 @@
Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
Headers/core_object.h
@@ -178,7 +178,7 @@
Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
Headers/dherr.h
@@ -242,7 +242,7 @@
Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
Headers/ess.h
@@ -254,7 +254,7 @@
Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
Headers/evperr.h
@@ -274,15 +274,15 @@
Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
Headers/idea.h
@@ -298,7 +298,7 @@
Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
Headers/macros.h
@@ -326,7 +326,7 @@
Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
Headers/objects.h
@@ -350,7 +350,7 @@
Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
Headers/ossl_typ.h
@@ -386,7 +386,7 @@
Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
Headers/pkcs7err.h
@@ -406,7 +406,7 @@
Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
Headers/rand.h
@@ -450,7 +450,7 @@
Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
Headers/sha.h
@@ -470,7 +470,7 @@
Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
Headers/ssl2.h
@@ -482,11 +482,11 @@
Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
Headers/stack.h
@@ -550,7 +550,7 @@
Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
Headers/x509err.h
@@ -566,7 +566,7 @@
Info.plist
- HLzm/NeSNfFVhCsA8UzYIsaUqHM=
+ BaBjJFDy/wmh+4hCtvTo+wR8/t4=
Modules/module.modulemap
@@ -604,7 +604,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -632,7 +632,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -702,7 +702,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -716,7 +716,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -751,7 +751,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -772,7 +772,7 @@
hash2
- IpHQkJF4VaqWvnjuBwDTpgPit005UE7TD1zcMBHXGV0=
+ GzGZPhjWponkERprdtYtXJ3Qe5xq4pjL32P/iKMmkTQ=
Headers/conftypes.h
@@ -793,14 +793,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -884,7 +884,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -996,7 +996,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -1017,7 +1017,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -1052,21 +1052,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -1094,7 +1094,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -1143,7 +1143,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -1185,7 +1185,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -1248,7 +1248,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -1283,7 +1283,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -1360,7 +1360,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -1395,7 +1395,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -1416,14 +1416,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -1535,7 +1535,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/asn1err.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/asn1err.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/bio.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/bio.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/cmp.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/cmp.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/cmperr.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/cmperr.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/conf.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/conf.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/configuration.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/configuration.h
index c29c8891..cc8c2a01 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/configuration.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_XROS
# define OPENSSL_SYS_XROS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/core_dispatch.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/core_dispatch.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/core_names.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/core_names.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/dh.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/dh.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/err.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/err.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/evp.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/evp.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/hpke.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/hpke.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/http.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/http.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/httperr.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/httperr.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/lhash.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/lhash.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/obj_mac.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/obj_mac.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/opensslv.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/opensslv.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/pkcs7.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/pkcs7.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/quic.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/quic.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/self_test.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/self_test.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/ssl.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/ssl.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/sslerr.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/sslerr.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/sslerr_legacy.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/sslerr_legacy.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/x509_vfy.h b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/x509_vfy.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Info.plist b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Info.plist
index 1c80f059..0595eb5b 100644
Binary files a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Info.plist and b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/Info.plist differ
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/OpenSSL b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/OpenSSL
index dd26080e..e43afabb 100755
Binary files a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/OpenSSL and b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/OpenSSL differ
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/_CodeSignature/CodeResources
index eaf262c0..aac8ba1e 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/_CodeSignature/CodeResources
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64/OpenSSL.framework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
Headers/asn1t.h
@@ -34,7 +34,7 @@
Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
Headers/bioerr.h
@@ -74,7 +74,7 @@
Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
Headers/cmp_util.h
@@ -82,7 +82,7 @@
Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
Headers/cms.h
@@ -102,7 +102,7 @@
Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
Headers/conf_api.h
@@ -114,7 +114,7 @@
Headers/configuration.h
- yjr15PIOf/CqzXE+85wawHh2fs8=
+ QHnJsrU4bBKEKavpabchMyFg1qw=
Headers/conftypes.h
@@ -126,11 +126,11 @@
Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
Headers/core_object.h
@@ -178,7 +178,7 @@
Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
Headers/dherr.h
@@ -242,7 +242,7 @@
Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
Headers/ess.h
@@ -254,7 +254,7 @@
Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
Headers/evperr.h
@@ -274,15 +274,15 @@
Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
Headers/idea.h
@@ -298,7 +298,7 @@
Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
Headers/macros.h
@@ -326,7 +326,7 @@
Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
Headers/objects.h
@@ -350,7 +350,7 @@
Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
Headers/ossl_typ.h
@@ -386,7 +386,7 @@
Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
Headers/pkcs7err.h
@@ -406,7 +406,7 @@
Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
Headers/rand.h
@@ -450,7 +450,7 @@
Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
Headers/sha.h
@@ -470,7 +470,7 @@
Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
Headers/ssl2.h
@@ -482,11 +482,11 @@
Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
Headers/stack.h
@@ -550,7 +550,7 @@
Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
Headers/x509err.h
@@ -566,7 +566,7 @@
Info.plist
- bah+ENbAp1Hpqi3etWGe3quZea0=
+ /XbqrrnFkhc9Trgp5hE4N03KGbI=
Modules/module.modulemap
@@ -604,7 +604,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -632,7 +632,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -702,7 +702,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -716,7 +716,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -751,7 +751,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -772,7 +772,7 @@
hash2
- kQ0lT9tiBDKsIi568LOmHyQmGYb3fv0zm5pkr4ipmEQ=
+ /1F1LK3Okl498njz5uYoJsQbFIfRsnc9SBHVh4neOaA=
Headers/conftypes.h
@@ -793,14 +793,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -884,7 +884,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -996,7 +996,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -1017,7 +1017,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -1052,21 +1052,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -1094,7 +1094,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -1143,7 +1143,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -1185,7 +1185,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -1248,7 +1248,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -1283,7 +1283,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -1360,7 +1360,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -1395,7 +1395,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -1416,14 +1416,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -1535,7 +1535,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h
index c29c8891..cc8c2a01 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_XROS
# define OPENSSL_SYS_XROS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Info.plist b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Info.plist
index b29902ed..26937db5 100644
Binary files a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Info.plist and b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/Info.plist differ
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL
index a2d260b4..59e580f0 100755
Binary files a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL and b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/OpenSSL differ
diff --git a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources
index 7caea289..1ffd77d3 100644
--- a/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources
+++ b/Frameworks/OpenSSL.xcframework/xros-arm64_x86_64-simulator/OpenSSL.framework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
Headers/asn1t.h
@@ -34,7 +34,7 @@
Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
Headers/bioerr.h
@@ -74,7 +74,7 @@
Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
Headers/cmp_util.h
@@ -82,7 +82,7 @@
Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
Headers/cms.h
@@ -102,7 +102,7 @@
Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
Headers/conf_api.h
@@ -114,7 +114,7 @@
Headers/configuration.h
- yjr15PIOf/CqzXE+85wawHh2fs8=
+ QHnJsrU4bBKEKavpabchMyFg1qw=
Headers/conftypes.h
@@ -126,11 +126,11 @@
Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
Headers/core_object.h
@@ -178,7 +178,7 @@
Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
Headers/dherr.h
@@ -242,7 +242,7 @@
Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
Headers/ess.h
@@ -254,7 +254,7 @@
Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
Headers/evperr.h
@@ -274,15 +274,15 @@
Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
Headers/idea.h
@@ -298,7 +298,7 @@
Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
Headers/macros.h
@@ -326,7 +326,7 @@
Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
Headers/objects.h
@@ -350,7 +350,7 @@
Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
Headers/ossl_typ.h
@@ -386,7 +386,7 @@
Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
Headers/pkcs7err.h
@@ -406,7 +406,7 @@
Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
Headers/rand.h
@@ -450,7 +450,7 @@
Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
Headers/sha.h
@@ -470,7 +470,7 @@
Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
Headers/ssl2.h
@@ -482,11 +482,11 @@
Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
Headers/stack.h
@@ -550,7 +550,7 @@
Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
Headers/x509err.h
@@ -566,7 +566,7 @@
Info.plist
- JNDlylPmM0ICLugnp7oBSPEc+I0=
+ gfVRBzQuHVlKIE3HAhPmhpt8z7g=
Modules/module.modulemap
@@ -604,7 +604,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -632,7 +632,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -702,7 +702,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -716,7 +716,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -751,7 +751,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -772,7 +772,7 @@
hash2
- kQ0lT9tiBDKsIi568LOmHyQmGYb3fv0zm5pkr4ipmEQ=
+ /1F1LK3Okl498njz5uYoJsQbFIfRsnc9SBHVh4neOaA=
Headers/conftypes.h
@@ -793,14 +793,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -884,7 +884,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -996,7 +996,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -1017,7 +1017,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -1052,21 +1052,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -1094,7 +1094,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -1143,7 +1143,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -1185,7 +1185,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -1248,7 +1248,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -1283,7 +1283,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -1360,7 +1360,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -1395,7 +1395,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -1416,14 +1416,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -1535,7 +1535,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/asn1err.h b/Frameworks/appletvos/OpenSSL.framework/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/asn1err.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/bio.h b/Frameworks/appletvos/OpenSSL.framework/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/bio.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/cmp.h b/Frameworks/appletvos/OpenSSL.framework/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/cmp.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/cmperr.h b/Frameworks/appletvos/OpenSSL.framework/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/cmperr.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/conf.h b/Frameworks/appletvos/OpenSSL.framework/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/conf.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/configuration.h b/Frameworks/appletvos/OpenSSL.framework/Headers/configuration.h
index e53c0dac..ec23fdc0 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/configuration.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_tvOS
# define OPENSSL_SYS_tvOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/core_dispatch.h b/Frameworks/appletvos/OpenSSL.framework/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/core_dispatch.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/core_names.h b/Frameworks/appletvos/OpenSSL.framework/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/core_names.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/dh.h b/Frameworks/appletvos/OpenSSL.framework/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/dh.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/err.h b/Frameworks/appletvos/OpenSSL.framework/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/err.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/evp.h b/Frameworks/appletvos/OpenSSL.framework/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/evp.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/hpke.h b/Frameworks/appletvos/OpenSSL.framework/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/hpke.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/http.h b/Frameworks/appletvos/OpenSSL.framework/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/http.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/httperr.h b/Frameworks/appletvos/OpenSSL.framework/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/httperr.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/lhash.h b/Frameworks/appletvos/OpenSSL.framework/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/lhash.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/obj_mac.h b/Frameworks/appletvos/OpenSSL.framework/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/obj_mac.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/opensslv.h b/Frameworks/appletvos/OpenSSL.framework/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/opensslv.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/pkcs7.h b/Frameworks/appletvos/OpenSSL.framework/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/pkcs7.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/quic.h b/Frameworks/appletvos/OpenSSL.framework/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/quic.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/self_test.h b/Frameworks/appletvos/OpenSSL.framework/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/self_test.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/ssl.h b/Frameworks/appletvos/OpenSSL.framework/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/ssl.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/sslerr.h b/Frameworks/appletvos/OpenSSL.framework/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/sslerr.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/sslerr_legacy.h b/Frameworks/appletvos/OpenSSL.framework/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/sslerr_legacy.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/appletvos/OpenSSL.framework/Headers/x509_vfy.h b/Frameworks/appletvos/OpenSSL.framework/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/appletvos/OpenSSL.framework/Headers/x509_vfy.h
+++ b/Frameworks/appletvos/OpenSSL.framework/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/appletvos/OpenSSL.framework/Info.plist b/Frameworks/appletvos/OpenSSL.framework/Info.plist
index 47917f5a..55b2b421 100644
Binary files a/Frameworks/appletvos/OpenSSL.framework/Info.plist and b/Frameworks/appletvos/OpenSSL.framework/Info.plist differ
diff --git a/Frameworks/appletvos/OpenSSL.framework/OpenSSL b/Frameworks/appletvos/OpenSSL.framework/OpenSSL
index a192b9b4..131af151 100755
Binary files a/Frameworks/appletvos/OpenSSL.framework/OpenSSL and b/Frameworks/appletvos/OpenSSL.framework/OpenSSL differ
diff --git a/Frameworks/appletvos/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/appletvos/OpenSSL.framework/_CodeSignature/CodeResources
index 11bdded8..f1860b37 100644
--- a/Frameworks/appletvos/OpenSSL.framework/_CodeSignature/CodeResources
+++ b/Frameworks/appletvos/OpenSSL.framework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
Headers/asn1t.h
@@ -34,7 +34,7 @@
Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
Headers/bioerr.h
@@ -74,7 +74,7 @@
Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
Headers/cmp_util.h
@@ -82,7 +82,7 @@
Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
Headers/cms.h
@@ -102,7 +102,7 @@
Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
Headers/conf_api.h
@@ -114,7 +114,7 @@
Headers/configuration.h
- 31BE8LwRUj29KzYtu8s7CYNvvoY=
+ uq6EBUgROXJefAoIu8jjfcdUMSg=
Headers/conftypes.h
@@ -126,11 +126,11 @@
Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
Headers/core_object.h
@@ -178,7 +178,7 @@
Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
Headers/dherr.h
@@ -242,7 +242,7 @@
Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
Headers/ess.h
@@ -254,7 +254,7 @@
Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
Headers/evperr.h
@@ -274,15 +274,15 @@
Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
Headers/idea.h
@@ -298,7 +298,7 @@
Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
Headers/macros.h
@@ -326,7 +326,7 @@
Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
Headers/objects.h
@@ -350,7 +350,7 @@
Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
Headers/ossl_typ.h
@@ -386,7 +386,7 @@
Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
Headers/pkcs7err.h
@@ -406,7 +406,7 @@
Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
Headers/rand.h
@@ -450,7 +450,7 @@
Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
Headers/sha.h
@@ -470,7 +470,7 @@
Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
Headers/ssl2.h
@@ -482,11 +482,11 @@
Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
Headers/stack.h
@@ -550,7 +550,7 @@
Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
Headers/x509err.h
@@ -566,7 +566,7 @@
Info.plist
- +KCnD2Ok5EzpN+IJyljnRpZaVNw=
+ 8A79UJgte5+L5td+gODvDoGGl8I=
Modules/module.modulemap
@@ -604,7 +604,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -632,7 +632,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -702,7 +702,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -716,7 +716,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -751,7 +751,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -772,7 +772,7 @@
hash2
- ER9xEddHqSW07OKwxmxDF6wnf3kxWVZk/1pXhWOkMRg=
+ 0xjQLhfP7NnFyVR7Zyunl/Vf475YpuuV5M/sNQckdd0=
Headers/conftypes.h
@@ -793,14 +793,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -884,7 +884,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -996,7 +996,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -1017,7 +1017,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -1052,21 +1052,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -1094,7 +1094,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -1143,7 +1143,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -1185,7 +1185,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -1248,7 +1248,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -1283,7 +1283,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -1360,7 +1360,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -1395,7 +1395,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -1416,14 +1416,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -1535,7 +1535,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/asn1err.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/asn1err.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/bio.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/bio.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/cmp.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/cmp.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/cmperr.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/cmperr.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/conf.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/conf.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/configuration.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/configuration.h
index e53c0dac..ec23fdc0 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/configuration.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_tvOS
# define OPENSSL_SYS_tvOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/core_dispatch.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/core_dispatch.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/core_names.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/core_names.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/dh.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/dh.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/err.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/err.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/evp.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/evp.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/hpke.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/hpke.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/http.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/http.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/httperr.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/httperr.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/lhash.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/lhash.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/obj_mac.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/obj_mac.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/opensslv.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/opensslv.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/pkcs7.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/pkcs7.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/quic.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/quic.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/self_test.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/self_test.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/ssl.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/ssl.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/sslerr.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/sslerr.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/sslerr_legacy.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/sslerr_legacy.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/x509_vfy.h b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/Headers/x509_vfy.h
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/Info.plist b/Frameworks/appletvsimulator/OpenSSL.framework/Info.plist
index dbbb02ac..0612ec33 100644
Binary files a/Frameworks/appletvsimulator/OpenSSL.framework/Info.plist and b/Frameworks/appletvsimulator/OpenSSL.framework/Info.plist differ
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/OpenSSL b/Frameworks/appletvsimulator/OpenSSL.framework/OpenSSL
index c271073a..d6eeed56 100755
Binary files a/Frameworks/appletvsimulator/OpenSSL.framework/OpenSSL and b/Frameworks/appletvsimulator/OpenSSL.framework/OpenSSL differ
diff --git a/Frameworks/appletvsimulator/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/appletvsimulator/OpenSSL.framework/_CodeSignature/CodeResources
index aea24d78..170e3e44 100644
--- a/Frameworks/appletvsimulator/OpenSSL.framework/_CodeSignature/CodeResources
+++ b/Frameworks/appletvsimulator/OpenSSL.framework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
Headers/asn1t.h
@@ -34,7 +34,7 @@
Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
Headers/bioerr.h
@@ -74,7 +74,7 @@
Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
Headers/cmp_util.h
@@ -82,7 +82,7 @@
Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
Headers/cms.h
@@ -102,7 +102,7 @@
Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
Headers/conf_api.h
@@ -114,7 +114,7 @@
Headers/configuration.h
- 31BE8LwRUj29KzYtu8s7CYNvvoY=
+ uq6EBUgROXJefAoIu8jjfcdUMSg=
Headers/conftypes.h
@@ -126,11 +126,11 @@
Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
Headers/core_object.h
@@ -178,7 +178,7 @@
Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
Headers/dherr.h
@@ -242,7 +242,7 @@
Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
Headers/ess.h
@@ -254,7 +254,7 @@
Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
Headers/evperr.h
@@ -274,15 +274,15 @@
Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
Headers/idea.h
@@ -298,7 +298,7 @@
Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
Headers/macros.h
@@ -326,7 +326,7 @@
Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
Headers/objects.h
@@ -350,7 +350,7 @@
Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
Headers/ossl_typ.h
@@ -386,7 +386,7 @@
Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
Headers/pkcs7err.h
@@ -406,7 +406,7 @@
Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
Headers/rand.h
@@ -450,7 +450,7 @@
Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
Headers/sha.h
@@ -470,7 +470,7 @@
Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
Headers/ssl2.h
@@ -482,11 +482,11 @@
Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
Headers/stack.h
@@ -550,7 +550,7 @@
Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
Headers/x509err.h
@@ -566,7 +566,7 @@
Info.plist
- gd7rWr8OhyDXUVClEo5R5CxFUjQ=
+ RujmUhI9pGkvC2ffIjcIJJ7xTBA=
Modules/module.modulemap
@@ -604,7 +604,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -632,7 +632,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -702,7 +702,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -716,7 +716,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -751,7 +751,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -772,7 +772,7 @@
hash2
- ER9xEddHqSW07OKwxmxDF6wnf3kxWVZk/1pXhWOkMRg=
+ 0xjQLhfP7NnFyVR7Zyunl/Vf475YpuuV5M/sNQckdd0=
Headers/conftypes.h
@@ -793,14 +793,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -884,7 +884,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -996,7 +996,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -1017,7 +1017,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -1052,21 +1052,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -1094,7 +1094,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -1143,7 +1143,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -1185,7 +1185,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -1248,7 +1248,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -1283,7 +1283,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -1360,7 +1360,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -1395,7 +1395,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -1416,14 +1416,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -1535,7 +1535,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/asn1err.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/asn1err.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/bio.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/bio.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/cmp.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/cmp.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/cmperr.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/cmperr.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/conf.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/conf.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/configuration.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/configuration.h
index 09071376..1dacd74f 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/configuration.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_iOS
# define OPENSSL_SYS_iOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/core_dispatch.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/core_dispatch.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/core_names.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/core_names.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/dh.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/dh.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/err.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/err.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/evp.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/evp.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/hpke.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/hpke.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/http.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/http.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/httperr.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/httperr.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/lhash.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/lhash.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/obj_mac.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/obj_mac.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslv.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslv.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/pkcs7.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/pkcs7.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/quic.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/quic.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/self_test.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/self_test.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/ssl.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/ssl.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/sslerr.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/sslerr.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/sslerr_legacy.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/sslerr_legacy.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Headers/x509_vfy.h b/Frameworks/iphoneos/OpenSSL.framework/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/Headers/x509_vfy.h
+++ b/Frameworks/iphoneos/OpenSSL.framework/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/iphoneos/OpenSSL.framework/Info.plist b/Frameworks/iphoneos/OpenSSL.framework/Info.plist
index df714eec..7fdcc31f 100644
Binary files a/Frameworks/iphoneos/OpenSSL.framework/Info.plist and b/Frameworks/iphoneos/OpenSSL.framework/Info.plist differ
diff --git a/Frameworks/iphoneos/OpenSSL.framework/OpenSSL b/Frameworks/iphoneos/OpenSSL.framework/OpenSSL
index 1ead36f9..feddcc8e 100755
Binary files a/Frameworks/iphoneos/OpenSSL.framework/OpenSSL and b/Frameworks/iphoneos/OpenSSL.framework/OpenSSL differ
diff --git a/Frameworks/iphoneos/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/iphoneos/OpenSSL.framework/_CodeSignature/CodeResources
index 79e5f552..e70e8a48 100644
--- a/Frameworks/iphoneos/OpenSSL.framework/_CodeSignature/CodeResources
+++ b/Frameworks/iphoneos/OpenSSL.framework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
Headers/asn1t.h
@@ -34,7 +34,7 @@
Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
Headers/bioerr.h
@@ -74,7 +74,7 @@
Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
Headers/cmp_util.h
@@ -82,7 +82,7 @@
Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
Headers/cms.h
@@ -102,7 +102,7 @@
Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
Headers/conf_api.h
@@ -114,7 +114,7 @@
Headers/configuration.h
- ia9Lq9Ma5Kl0sdwkNFmHsS3OUkU=
+ MFiooVP1OE4028WfQZREAH2Ma64=
Headers/conftypes.h
@@ -126,11 +126,11 @@
Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
Headers/core_object.h
@@ -178,7 +178,7 @@
Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
Headers/dherr.h
@@ -242,7 +242,7 @@
Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
Headers/ess.h
@@ -254,7 +254,7 @@
Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
Headers/evperr.h
@@ -274,15 +274,15 @@
Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
Headers/idea.h
@@ -298,7 +298,7 @@
Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
Headers/macros.h
@@ -326,7 +326,7 @@
Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
Headers/objects.h
@@ -350,7 +350,7 @@
Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
Headers/ossl_typ.h
@@ -386,7 +386,7 @@
Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
Headers/pkcs7err.h
@@ -406,7 +406,7 @@
Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
Headers/rand.h
@@ -450,7 +450,7 @@
Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
Headers/sha.h
@@ -470,7 +470,7 @@
Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
Headers/ssl2.h
@@ -482,11 +482,11 @@
Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
Headers/stack.h
@@ -550,7 +550,7 @@
Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
Headers/x509err.h
@@ -566,7 +566,7 @@
Info.plist
- QrYuUiaf0eAsvjMGE/3sfZCnj4w=
+ 0M5H0ChbB+HbzSq0fxnVTEuStwM=
Modules/module.modulemap
@@ -604,7 +604,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -632,7 +632,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -702,7 +702,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -716,7 +716,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -751,7 +751,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -772,7 +772,7 @@
hash2
- U+oCGPKn5mmjbIJuiM9+qxL6r+Nyru/o9FRYnKGxn88=
+ nYZRBqi1sSU1SGq1+GEl+ZtOkMzUzBwMp4jmSNG+gF4=
Headers/conftypes.h
@@ -793,14 +793,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -884,7 +884,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -996,7 +996,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -1017,7 +1017,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -1052,21 +1052,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -1094,7 +1094,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -1143,7 +1143,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -1185,7 +1185,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -1248,7 +1248,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -1283,7 +1283,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -1360,7 +1360,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -1395,7 +1395,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -1416,14 +1416,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -1535,7 +1535,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/asn1err.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/asn1err.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/bio.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/bio.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/cmp.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/cmp.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/cmperr.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/cmperr.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/conf.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/conf.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/configuration.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/configuration.h
index 09071376..1dacd74f 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/configuration.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_iOS
# define OPENSSL_SYS_iOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/core_dispatch.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/core_dispatch.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/core_names.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/core_names.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/dh.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/dh.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/err.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/err.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/evp.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/evp.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/hpke.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/hpke.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/http.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/http.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/httperr.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/httperr.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/lhash.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/lhash.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/obj_mac.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/obj_mac.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/opensslv.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/opensslv.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/pkcs7.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/pkcs7.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/quic.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/quic.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/self_test.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/self_test.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/ssl.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/ssl.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/sslerr.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/sslerr.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/sslerr_legacy.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/sslerr_legacy.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/x509_vfy.h b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/Headers/x509_vfy.h
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/Info.plist b/Frameworks/iphonesimulator/OpenSSL.framework/Info.plist
index a536f4bb..555a1a47 100644
Binary files a/Frameworks/iphonesimulator/OpenSSL.framework/Info.plist and b/Frameworks/iphonesimulator/OpenSSL.framework/Info.plist differ
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/OpenSSL b/Frameworks/iphonesimulator/OpenSSL.framework/OpenSSL
index d5d69022..5a86e511 100755
Binary files a/Frameworks/iphonesimulator/OpenSSL.framework/OpenSSL and b/Frameworks/iphonesimulator/OpenSSL.framework/OpenSSL differ
diff --git a/Frameworks/iphonesimulator/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/iphonesimulator/OpenSSL.framework/_CodeSignature/CodeResources
index b5ffae67..14664b9d 100644
--- a/Frameworks/iphonesimulator/OpenSSL.framework/_CodeSignature/CodeResources
+++ b/Frameworks/iphonesimulator/OpenSSL.framework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
Headers/asn1t.h
@@ -34,7 +34,7 @@
Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
Headers/bioerr.h
@@ -74,7 +74,7 @@
Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
Headers/cmp_util.h
@@ -82,7 +82,7 @@
Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
Headers/cms.h
@@ -102,7 +102,7 @@
Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
Headers/conf_api.h
@@ -114,7 +114,7 @@
Headers/configuration.h
- ia9Lq9Ma5Kl0sdwkNFmHsS3OUkU=
+ MFiooVP1OE4028WfQZREAH2Ma64=
Headers/conftypes.h
@@ -126,11 +126,11 @@
Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
Headers/core_object.h
@@ -178,7 +178,7 @@
Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
Headers/dherr.h
@@ -242,7 +242,7 @@
Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
Headers/ess.h
@@ -254,7 +254,7 @@
Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
Headers/evperr.h
@@ -274,15 +274,15 @@
Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
Headers/idea.h
@@ -298,7 +298,7 @@
Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
Headers/macros.h
@@ -326,7 +326,7 @@
Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
Headers/objects.h
@@ -350,7 +350,7 @@
Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
Headers/ossl_typ.h
@@ -386,7 +386,7 @@
Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
Headers/pkcs7err.h
@@ -406,7 +406,7 @@
Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
Headers/rand.h
@@ -450,7 +450,7 @@
Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
Headers/sha.h
@@ -470,7 +470,7 @@
Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
Headers/ssl2.h
@@ -482,11 +482,11 @@
Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
Headers/stack.h
@@ -550,7 +550,7 @@
Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
Headers/x509err.h
@@ -566,7 +566,7 @@
Info.plist
- Wx0Sw4H53tuW3NqecVlInMDXno4=
+ 1fmnrzc1+fTlJCB5QahopmxgsCE=
Modules/module.modulemap
@@ -604,7 +604,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -632,7 +632,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -702,7 +702,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -716,7 +716,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -751,7 +751,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -772,7 +772,7 @@
hash2
- U+oCGPKn5mmjbIJuiM9+qxL6r+Nyru/o9FRYnKGxn88=
+ nYZRBqi1sSU1SGq1+GEl+ZtOkMzUzBwMp4jmSNG+gF4=
Headers/conftypes.h
@@ -793,14 +793,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -884,7 +884,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -996,7 +996,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -1017,7 +1017,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -1052,21 +1052,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -1094,7 +1094,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -1143,7 +1143,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -1185,7 +1185,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -1248,7 +1248,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -1283,7 +1283,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -1360,7 +1360,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -1395,7 +1395,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -1416,14 +1416,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -1535,7 +1535,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/asn1err.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/asn1err.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/bio.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/bio.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/cmp.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/cmp.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/cmperr.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/cmperr.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/conf.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/conf.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/configuration.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/configuration.h
index 9eac98ec..775e0c38 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/configuration.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_MacOSX
# define OPENSSL_SYS_MacOSX 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/core_dispatch.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/core_dispatch.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/core_names.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/core_names.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/dh.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/dh.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/err.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/err.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/evp.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/evp.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/hpke.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/hpke.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/http.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/http.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/httperr.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/httperr.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/lhash.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/lhash.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/obj_mac.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/obj_mac.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/opensslv.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/opensslv.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/pkcs7.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/pkcs7.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/quic.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/quic.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/self_test.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/self_test.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/ssl.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/ssl.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/sslerr.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/sslerr.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/x509_vfy.h b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/x509_vfy.h
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/OpenSSL b/Frameworks/macosx/OpenSSL.framework/Versions/A/OpenSSL
index 4bb27c47..302ed2da 100755
Binary files a/Frameworks/macosx/OpenSSL.framework/Versions/A/OpenSSL and b/Frameworks/macosx/OpenSSL.framework/Versions/A/OpenSSL differ
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/Resources/Info.plist b/Frameworks/macosx/OpenSSL.framework/Versions/A/Resources/Info.plist
index 5c5ffe87..75d14e2c 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/Resources/Info.plist
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/Resources/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 3.2.2000
+ 3.3.1000
CFBundleSupportedPlatforms
MacOSX
diff --git a/Frameworks/macosx/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources b/Frameworks/macosx/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources
index 649dc7a4..7b8df78e 100644
--- a/Frameworks/macosx/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources
+++ b/Frameworks/macosx/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources
@@ -6,7 +6,7 @@
Resources/Info.plist
- ygSh/JNcojZ+defoLJ/ubUODJLc=
+ RVfpW11pj5w5M5ZTL/SkqGynaN8=
Resources/PrivacyInfo.xcprivacy
@@ -40,7 +40,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -68,7 +68,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -138,7 +138,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -152,7 +152,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -187,7 +187,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -208,7 +208,7 @@
hash2
- +jfF9b6H8IHvka44tRlIBPNUCGZJHt5pUyvP/gzKB1U=
+ vPsBXnSq792SdhY8trfuMoDoG/ngWckXRzIMy71iz4Q=
Headers/conftypes.h
@@ -229,14 +229,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -320,7 +320,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -432,7 +432,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -453,7 +453,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -488,21 +488,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -530,7 +530,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -579,7 +579,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -621,7 +621,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -684,7 +684,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -719,7 +719,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -796,7 +796,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -831,7 +831,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -852,14 +852,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -971,7 +971,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
@@ -1006,7 +1006,7 @@
hash2
- X+T9j5rz5orbYzukuy7H2TfiCOx9yj/t2Vxn7bcwYwg=
+ 3F/RwVsnL4REPwj/FLKyYJA3570XliTO/lTmKe/HzQM=
Resources/PrivacyInfo.xcprivacy
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/asn1err.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/asn1err.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/bio.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/bio.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/cmp.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/cmp.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/cmperr.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/cmperr.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/conf.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/conf.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/configuration.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/configuration.h
index 9eac98ec..775e0c38 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/configuration.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_MacOSX
# define OPENSSL_SYS_MacOSX 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/core_dispatch.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/core_dispatch.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/core_names.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/core_names.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/dh.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/dh.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/err.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/err.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/evp.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/evp.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/hpke.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/hpke.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/http.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/http.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/httperr.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/httperr.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/lhash.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/lhash.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/obj_mac.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/obj_mac.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/opensslv.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/opensslv.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/pkcs7.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/pkcs7.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/quic.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/quic.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/self_test.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/self_test.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/ssl.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/ssl.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/sslerr.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/sslerr.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/x509_vfy.h b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/x509_vfy.h
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/OpenSSL b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/OpenSSL
index 1065a5b9..fefea833 100755
Binary files a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/OpenSSL and b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/OpenSSL differ
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Resources/Info.plist b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Resources/Info.plist
index 2a79dc8f..941acfe9 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Resources/Info.plist
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/Resources/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 3.2.2000
+ 3.3.1000
CFBundleSupportedPlatforms
MacOSX
diff --git a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources
index 1e983872..4a7383d7 100644
--- a/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources
+++ b/Frameworks/macosx_catalyst/OpenSSL.framework/Versions/A/_CodeSignature/CodeResources
@@ -6,7 +6,7 @@
Resources/Info.plist
- locKjucac2EJ89FRFaQ2fAquWYc=
+ 5W0vEiZk7ITLhx3QF5fsQmDSSNc=
Resources/PrivacyInfo.xcprivacy
@@ -40,7 +40,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -68,7 +68,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -138,7 +138,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -152,7 +152,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -187,7 +187,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -208,7 +208,7 @@
hash2
- +jfF9b6H8IHvka44tRlIBPNUCGZJHt5pUyvP/gzKB1U=
+ vPsBXnSq792SdhY8trfuMoDoG/ngWckXRzIMy71iz4Q=
Headers/conftypes.h
@@ -229,14 +229,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -320,7 +320,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -432,7 +432,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -453,7 +453,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -488,21 +488,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -530,7 +530,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -579,7 +579,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -621,7 +621,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -684,7 +684,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -719,7 +719,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -796,7 +796,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -831,7 +831,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -852,14 +852,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -971,7 +971,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
@@ -1006,7 +1006,7 @@
hash2
- ez/Aj0H33BcLqRgrYn5ICQTTXnbR7jOS5WgmhhjSVUg=
+ VcU7auj9ICh7uMZaOAU/f692zrBm9+U0FO4t+jnHU8g=
Resources/PrivacyInfo.xcprivacy
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/asn1err.h b/Frameworks/visionos/OpenSSL.framework/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/asn1err.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/bio.h b/Frameworks/visionos/OpenSSL.framework/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/bio.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/cmp.h b/Frameworks/visionos/OpenSSL.framework/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/cmp.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/cmperr.h b/Frameworks/visionos/OpenSSL.framework/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/cmperr.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/conf.h b/Frameworks/visionos/OpenSSL.framework/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/conf.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/configuration.h b/Frameworks/visionos/OpenSSL.framework/Headers/configuration.h
index c29c8891..cc8c2a01 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/configuration.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_XROS
# define OPENSSL_SYS_XROS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/core_dispatch.h b/Frameworks/visionos/OpenSSL.framework/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/core_dispatch.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/core_names.h b/Frameworks/visionos/OpenSSL.framework/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/core_names.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/dh.h b/Frameworks/visionos/OpenSSL.framework/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/dh.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/err.h b/Frameworks/visionos/OpenSSL.framework/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/err.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/evp.h b/Frameworks/visionos/OpenSSL.framework/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/evp.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/hpke.h b/Frameworks/visionos/OpenSSL.framework/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/hpke.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/http.h b/Frameworks/visionos/OpenSSL.framework/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/http.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/httperr.h b/Frameworks/visionos/OpenSSL.framework/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/httperr.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/lhash.h b/Frameworks/visionos/OpenSSL.framework/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/lhash.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/obj_mac.h b/Frameworks/visionos/OpenSSL.framework/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/obj_mac.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/opensslv.h b/Frameworks/visionos/OpenSSL.framework/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/opensslv.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/pkcs7.h b/Frameworks/visionos/OpenSSL.framework/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/pkcs7.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/quic.h b/Frameworks/visionos/OpenSSL.framework/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/quic.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/self_test.h b/Frameworks/visionos/OpenSSL.framework/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/self_test.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/ssl.h b/Frameworks/visionos/OpenSSL.framework/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/ssl.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/sslerr.h b/Frameworks/visionos/OpenSSL.framework/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/sslerr.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/sslerr_legacy.h b/Frameworks/visionos/OpenSSL.framework/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/sslerr_legacy.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/visionos/OpenSSL.framework/Headers/x509_vfy.h b/Frameworks/visionos/OpenSSL.framework/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/visionos/OpenSSL.framework/Headers/x509_vfy.h
+++ b/Frameworks/visionos/OpenSSL.framework/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/visionos/OpenSSL.framework/Info.plist b/Frameworks/visionos/OpenSSL.framework/Info.plist
index 1c80f059..0595eb5b 100644
Binary files a/Frameworks/visionos/OpenSSL.framework/Info.plist and b/Frameworks/visionos/OpenSSL.framework/Info.plist differ
diff --git a/Frameworks/visionos/OpenSSL.framework/OpenSSL b/Frameworks/visionos/OpenSSL.framework/OpenSSL
index dd26080e..e43afabb 100755
Binary files a/Frameworks/visionos/OpenSSL.framework/OpenSSL and b/Frameworks/visionos/OpenSSL.framework/OpenSSL differ
diff --git a/Frameworks/visionos/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/visionos/OpenSSL.framework/_CodeSignature/CodeResources
index eaf262c0..aac8ba1e 100644
--- a/Frameworks/visionos/OpenSSL.framework/_CodeSignature/CodeResources
+++ b/Frameworks/visionos/OpenSSL.framework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
Headers/asn1t.h
@@ -34,7 +34,7 @@
Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
Headers/bioerr.h
@@ -74,7 +74,7 @@
Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
Headers/cmp_util.h
@@ -82,7 +82,7 @@
Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
Headers/cms.h
@@ -102,7 +102,7 @@
Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
Headers/conf_api.h
@@ -114,7 +114,7 @@
Headers/configuration.h
- yjr15PIOf/CqzXE+85wawHh2fs8=
+ QHnJsrU4bBKEKavpabchMyFg1qw=
Headers/conftypes.h
@@ -126,11 +126,11 @@
Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
Headers/core_object.h
@@ -178,7 +178,7 @@
Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
Headers/dherr.h
@@ -242,7 +242,7 @@
Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
Headers/ess.h
@@ -254,7 +254,7 @@
Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
Headers/evperr.h
@@ -274,15 +274,15 @@
Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
Headers/idea.h
@@ -298,7 +298,7 @@
Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
Headers/macros.h
@@ -326,7 +326,7 @@
Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
Headers/objects.h
@@ -350,7 +350,7 @@
Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
Headers/ossl_typ.h
@@ -386,7 +386,7 @@
Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
Headers/pkcs7err.h
@@ -406,7 +406,7 @@
Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
Headers/rand.h
@@ -450,7 +450,7 @@
Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
Headers/sha.h
@@ -470,7 +470,7 @@
Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
Headers/ssl2.h
@@ -482,11 +482,11 @@
Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
Headers/stack.h
@@ -550,7 +550,7 @@
Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
Headers/x509err.h
@@ -566,7 +566,7 @@
Info.plist
- bah+ENbAp1Hpqi3etWGe3quZea0=
+ /XbqrrnFkhc9Trgp5hE4N03KGbI=
Modules/module.modulemap
@@ -604,7 +604,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -632,7 +632,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -702,7 +702,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -716,7 +716,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -751,7 +751,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -772,7 +772,7 @@
hash2
- kQ0lT9tiBDKsIi568LOmHyQmGYb3fv0zm5pkr4ipmEQ=
+ /1F1LK3Okl498njz5uYoJsQbFIfRsnc9SBHVh4neOaA=
Headers/conftypes.h
@@ -793,14 +793,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -884,7 +884,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -996,7 +996,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -1017,7 +1017,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -1052,21 +1052,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -1094,7 +1094,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -1143,7 +1143,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -1185,7 +1185,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -1248,7 +1248,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -1283,7 +1283,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -1360,7 +1360,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -1395,7 +1395,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -1416,14 +1416,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -1535,7 +1535,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/asn1err.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/asn1err.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/bio.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/bio.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/cmp.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/cmp.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/cmperr.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/cmperr.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/conf.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/conf.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/configuration.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/configuration.h
index c29c8891..cc8c2a01 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/configuration.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_XROS
# define OPENSSL_SYS_XROS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/core_dispatch.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/core_dispatch.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/core_names.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/core_names.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/dh.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/dh.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/err.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/err.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/evp.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/evp.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/hpke.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/hpke.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/http.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/http.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/httperr.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/httperr.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/lhash.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/lhash.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/obj_mac.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/obj_mac.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/opensslv.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/opensslv.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/pkcs7.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/pkcs7.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/quic.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/quic.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/self_test.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/self_test.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/ssl.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/ssl.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/sslerr.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/sslerr.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/sslerr_legacy.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/sslerr_legacy.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Headers/x509_vfy.h b/Frameworks/visionsimulator/OpenSSL.framework/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/Headers/x509_vfy.h
+++ b/Frameworks/visionsimulator/OpenSSL.framework/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/Info.plist b/Frameworks/visionsimulator/OpenSSL.framework/Info.plist
index b29902ed..26937db5 100644
Binary files a/Frameworks/visionsimulator/OpenSSL.framework/Info.plist and b/Frameworks/visionsimulator/OpenSSL.framework/Info.plist differ
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/OpenSSL b/Frameworks/visionsimulator/OpenSSL.framework/OpenSSL
index a2d260b4..59e580f0 100755
Binary files a/Frameworks/visionsimulator/OpenSSL.framework/OpenSSL and b/Frameworks/visionsimulator/OpenSSL.framework/OpenSSL differ
diff --git a/Frameworks/visionsimulator/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/visionsimulator/OpenSSL.framework/_CodeSignature/CodeResources
index 7caea289..1ffd77d3 100644
--- a/Frameworks/visionsimulator/OpenSSL.framework/_CodeSignature/CodeResources
+++ b/Frameworks/visionsimulator/OpenSSL.framework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
Headers/asn1t.h
@@ -34,7 +34,7 @@
Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
Headers/bioerr.h
@@ -74,7 +74,7 @@
Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
Headers/cmp_util.h
@@ -82,7 +82,7 @@
Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
Headers/cms.h
@@ -102,7 +102,7 @@
Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
Headers/conf_api.h
@@ -114,7 +114,7 @@
Headers/configuration.h
- yjr15PIOf/CqzXE+85wawHh2fs8=
+ QHnJsrU4bBKEKavpabchMyFg1qw=
Headers/conftypes.h
@@ -126,11 +126,11 @@
Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
Headers/core_object.h
@@ -178,7 +178,7 @@
Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
Headers/dherr.h
@@ -242,7 +242,7 @@
Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
Headers/ess.h
@@ -254,7 +254,7 @@
Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
Headers/evperr.h
@@ -274,15 +274,15 @@
Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
Headers/idea.h
@@ -298,7 +298,7 @@
Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
Headers/macros.h
@@ -326,7 +326,7 @@
Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
Headers/objects.h
@@ -350,7 +350,7 @@
Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
Headers/ossl_typ.h
@@ -386,7 +386,7 @@
Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
Headers/pkcs7err.h
@@ -406,7 +406,7 @@
Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
Headers/rand.h
@@ -450,7 +450,7 @@
Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
Headers/sha.h
@@ -470,7 +470,7 @@
Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
Headers/ssl2.h
@@ -482,11 +482,11 @@
Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
Headers/stack.h
@@ -550,7 +550,7 @@
Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
Headers/x509err.h
@@ -566,7 +566,7 @@
Info.plist
- JNDlylPmM0ICLugnp7oBSPEc+I0=
+ gfVRBzQuHVlKIE3HAhPmhpt8z7g=
Modules/module.modulemap
@@ -604,7 +604,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -632,7 +632,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -702,7 +702,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -716,7 +716,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -751,7 +751,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -772,7 +772,7 @@
hash2
- kQ0lT9tiBDKsIi568LOmHyQmGYb3fv0zm5pkr4ipmEQ=
+ /1F1LK3Okl498njz5uYoJsQbFIfRsnc9SBHVh4neOaA=
Headers/conftypes.h
@@ -793,14 +793,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -884,7 +884,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -996,7 +996,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -1017,7 +1017,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -1052,21 +1052,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -1094,7 +1094,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -1143,7 +1143,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -1185,7 +1185,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -1248,7 +1248,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -1283,7 +1283,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -1360,7 +1360,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -1395,7 +1395,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -1416,14 +1416,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -1535,7 +1535,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/asn1err.h b/Frameworks/watchos/OpenSSL.framework/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/asn1err.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/bio.h b/Frameworks/watchos/OpenSSL.framework/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/bio.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/cmp.h b/Frameworks/watchos/OpenSSL.framework/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/cmp.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/cmperr.h b/Frameworks/watchos/OpenSSL.framework/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/cmperr.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/conf.h b/Frameworks/watchos/OpenSSL.framework/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/conf.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/configuration.h b/Frameworks/watchos/OpenSSL.framework/Headers/configuration.h
index 2e2e7246..ccd77db9 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/configuration.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_watchOS
# define OPENSSL_SYS_watchOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/core_dispatch.h b/Frameworks/watchos/OpenSSL.framework/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/core_dispatch.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/core_names.h b/Frameworks/watchos/OpenSSL.framework/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/core_names.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/dh.h b/Frameworks/watchos/OpenSSL.framework/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/dh.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/err.h b/Frameworks/watchos/OpenSSL.framework/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/err.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/evp.h b/Frameworks/watchos/OpenSSL.framework/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/evp.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/hpke.h b/Frameworks/watchos/OpenSSL.framework/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/hpke.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/http.h b/Frameworks/watchos/OpenSSL.framework/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/http.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/httperr.h b/Frameworks/watchos/OpenSSL.framework/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/httperr.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/lhash.h b/Frameworks/watchos/OpenSSL.framework/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/lhash.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/obj_mac.h b/Frameworks/watchos/OpenSSL.framework/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/obj_mac.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/opensslv.h b/Frameworks/watchos/OpenSSL.framework/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/opensslv.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/pkcs7.h b/Frameworks/watchos/OpenSSL.framework/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/pkcs7.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/quic.h b/Frameworks/watchos/OpenSSL.framework/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/quic.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/self_test.h b/Frameworks/watchos/OpenSSL.framework/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/self_test.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/ssl.h b/Frameworks/watchos/OpenSSL.framework/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/ssl.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/sslerr.h b/Frameworks/watchos/OpenSSL.framework/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/sslerr.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/sslerr_legacy.h b/Frameworks/watchos/OpenSSL.framework/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/sslerr_legacy.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/watchos/OpenSSL.framework/Headers/x509_vfy.h b/Frameworks/watchos/OpenSSL.framework/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/watchos/OpenSSL.framework/Headers/x509_vfy.h
+++ b/Frameworks/watchos/OpenSSL.framework/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/watchos/OpenSSL.framework/Info.plist b/Frameworks/watchos/OpenSSL.framework/Info.plist
index 7ae8585c..3bebab2c 100644
Binary files a/Frameworks/watchos/OpenSSL.framework/Info.plist and b/Frameworks/watchos/OpenSSL.framework/Info.plist differ
diff --git a/Frameworks/watchos/OpenSSL.framework/OpenSSL b/Frameworks/watchos/OpenSSL.framework/OpenSSL
index 3aed3e4e..0e33f245 100755
Binary files a/Frameworks/watchos/OpenSSL.framework/OpenSSL and b/Frameworks/watchos/OpenSSL.framework/OpenSSL differ
diff --git a/Frameworks/watchos/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/watchos/OpenSSL.framework/_CodeSignature/CodeResources
index cd1e626c..a07e2e72 100644
--- a/Frameworks/watchos/OpenSSL.framework/_CodeSignature/CodeResources
+++ b/Frameworks/watchos/OpenSSL.framework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
Headers/asn1t.h
@@ -34,7 +34,7 @@
Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
Headers/bioerr.h
@@ -74,7 +74,7 @@
Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
Headers/cmp_util.h
@@ -82,7 +82,7 @@
Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
Headers/cms.h
@@ -102,7 +102,7 @@
Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
Headers/conf_api.h
@@ -114,7 +114,7 @@
Headers/configuration.h
- mp4WLl5nQWdzgpf97VWrQ5tGnbY=
+ 2105ELXL7WvSfSB26S9l/juILmg=
Headers/conftypes.h
@@ -126,11 +126,11 @@
Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
Headers/core_object.h
@@ -178,7 +178,7 @@
Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
Headers/dherr.h
@@ -242,7 +242,7 @@
Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
Headers/ess.h
@@ -254,7 +254,7 @@
Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
Headers/evperr.h
@@ -274,15 +274,15 @@
Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
Headers/idea.h
@@ -298,7 +298,7 @@
Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
Headers/macros.h
@@ -326,7 +326,7 @@
Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
Headers/objects.h
@@ -350,7 +350,7 @@
Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
Headers/ossl_typ.h
@@ -386,7 +386,7 @@
Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
Headers/pkcs7err.h
@@ -406,7 +406,7 @@
Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
Headers/rand.h
@@ -450,7 +450,7 @@
Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
Headers/sha.h
@@ -470,7 +470,7 @@
Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
Headers/ssl2.h
@@ -482,11 +482,11 @@
Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
Headers/stack.h
@@ -550,7 +550,7 @@
Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
Headers/x509err.h
@@ -566,7 +566,7 @@
Info.plist
- WsRRl8h68x1Yl3IxQopDVCxzZAM=
+ W9oyX9WV39Z79V9nzFllt5GEQzg=
Modules/module.modulemap
@@ -616,11 +616,11 @@
hash
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -660,11 +660,11 @@
hash
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -770,11 +770,11 @@
hash
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -792,11 +792,11 @@
hash
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -847,11 +847,11 @@
hash
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -880,11 +880,11 @@
hash
- mp4WLl5nQWdzgpf97VWrQ5tGnbY=
+ 2105ELXL7WvSfSB26S9l/juILmg=
hash2
- IpHQkJF4VaqWvnjuBwDTpgPit005UE7TD1zcMBHXGV0=
+ GzGZPhjWponkERprdtYtXJ3Qe5xq4pjL32P/iKMmkTQ=
Headers/conftypes.h
@@ -913,22 +913,22 @@
hash
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -1056,11 +1056,11 @@
hash
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -1232,11 +1232,11 @@
hash
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -1265,11 +1265,11 @@
hash
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -1320,33 +1320,33 @@
hash
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -1386,11 +1386,11 @@
hash
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -1463,11 +1463,11 @@
hash
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -1529,11 +1529,11 @@
hash
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -1628,11 +1628,11 @@
hash
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -1683,11 +1683,11 @@
hash
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -1804,11 +1804,11 @@
hash
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -1859,11 +1859,11 @@
hash
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -1892,22 +1892,22 @@
hash
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -2079,11 +2079,11 @@
hash
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/asn1err.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/asn1err.h
index 4e6d052f..23dab986 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/asn1err.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/bio.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/bio.h
index 377fd310..eb91d61c 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/bio.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/cmp.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/cmp.h
index 342adaef..829d334d 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/cmp.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/cmperr.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/cmperr.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/conf.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/conf.h
index 581f435d..d99085b6 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/conf.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/configuration.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/configuration.h
index 2e2e7246..ccd77db9 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/configuration.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_watchOS
# define OPENSSL_SYS_watchOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/core_dispatch.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/core_dispatch.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/core_names.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/core_names.h
index ffffe90f..a6158056 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/core_names.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/dh.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/dh.h
index 50617e9e..c20ecb75 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/dh.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/err.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/err.h
index 42124abc..6b4f4165 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/err.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/evp.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/evp.h
index c8290eba..1716f700 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/evp.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/hpke.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/hpke.h
index e7155e4a..adefc552 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/hpke.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/http.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/http.h
index d33cc797..d3d786f0 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/http.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/httperr.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/httperr.h
index 70719671..d0aa82fb 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/httperr.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/lhash.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/lhash.h
index ea77b654..612121fd 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/lhash.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/obj_mac.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/obj_mac.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/opensslv.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/opensslv.h
index b3e2dc41..236448d7 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/opensslv.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/pkcs7.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/pkcs7.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/quic.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/quic.h
index 10aa86fc..79200a8c 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/quic.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/self_test.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/self_test.h
index 11ef0da3..46a024d9 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/self_test.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/ssl.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/ssl.h
index 0dbadf2f..006d063e 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/ssl.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/sslerr.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/sslerr.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/sslerr_legacy.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/sslerr_legacy.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Headers/x509_vfy.h b/Frameworks/watchsimulator/OpenSSL.framework/Headers/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/Headers/x509_vfy.h
+++ b/Frameworks/watchsimulator/OpenSSL.framework/Headers/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/Info.plist b/Frameworks/watchsimulator/OpenSSL.framework/Info.plist
index d200789f..d930707e 100644
Binary files a/Frameworks/watchsimulator/OpenSSL.framework/Info.plist and b/Frameworks/watchsimulator/OpenSSL.framework/Info.plist differ
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/OpenSSL b/Frameworks/watchsimulator/OpenSSL.framework/OpenSSL
index 60376eab..617b4438 100755
Binary files a/Frameworks/watchsimulator/OpenSSL.framework/OpenSSL and b/Frameworks/watchsimulator/OpenSSL.framework/OpenSSL differ
diff --git a/Frameworks/watchsimulator/OpenSSL.framework/_CodeSignature/CodeResources b/Frameworks/watchsimulator/OpenSSL.framework/_CodeSignature/CodeResources
index 4459eb91..a994d895 100644
--- a/Frameworks/watchsimulator/OpenSSL.framework/_CodeSignature/CodeResources
+++ b/Frameworks/watchsimulator/OpenSSL.framework/_CodeSignature/CodeResources
@@ -18,7 +18,7 @@
Headers/asn1err.h
- JeA7I0xLe/TI7dJ40YvWZMzHzVA=
+ tS86Gqt0DEMXPaN6ssAVmjdGv8Y=
Headers/asn1t.h
@@ -34,7 +34,7 @@
Headers/bio.h
- jf7KjxIHyE1IXp6H14cZiso92NU=
+ YlOVaYcoCYGmOsI0cFQExE8zTHo=
Headers/bioerr.h
@@ -74,7 +74,7 @@
Headers/cmp.h
- 3hQM8K1+mPoI1sq9JNa1vJ3t5OE=
+ xCuyoR5pMRqZp1xeLqqSUKSumks=
Headers/cmp_util.h
@@ -82,7 +82,7 @@
Headers/cmperr.h
- +4BIw5MfBnznjtxha/Zr/iM7Ipc=
+ /wkFxOZ/b0IRxIbdxsMbr0v5Ic0=
Headers/cms.h
@@ -102,7 +102,7 @@
Headers/conf.h
- eoMetSrNK1X+ip6Nv4MhDZFxESE=
+ uKHi3TarJFMYjjWf1z8JGfIa4JM=
Headers/conf_api.h
@@ -114,7 +114,7 @@
Headers/configuration.h
- mp4WLl5nQWdzgpf97VWrQ5tGnbY=
+ 2105ELXL7WvSfSB26S9l/juILmg=
Headers/conftypes.h
@@ -126,11 +126,11 @@
Headers/core_dispatch.h
- OEt2/D0GlXTJj92u50WOnLzBcZw=
+ 3ccgfSJ0j2WdwGzbs6pMPcW/6Fo=
Headers/core_names.h
- 14HBtWbGIKudKLLGnsLvx1qFFAw=
+ muDhvMAIq9syv9DDpI2Eln4p9/k=
Headers/core_object.h
@@ -178,7 +178,7 @@
Headers/dh.h
- Hl6RySa2mJJRLspuJ3oCUWG+ZI4=
+ mlFON7uQ3znc8S1dGK7jI//oOHw=
Headers/dherr.h
@@ -242,7 +242,7 @@
Headers/err.h
- PtVZORM3ByW96U6jpN72xVA5Dlo=
+ lbEJ8cCy0vzRzoJi7jH0EoL5sWA=
Headers/ess.h
@@ -254,7 +254,7 @@
Headers/evp.h
- u8HQdWo73ke46uV//yNBE9jiFec=
+ vTXPZ9hwPkvT3kFXA1KTnmcy79I=
Headers/evperr.h
@@ -274,15 +274,15 @@
Headers/hpke.h
- C4ovQTTt0OhXALzYIGunYN0Watg=
+ 1uOnt9nZxAFqpiIsUaa5pVeGFWo=
Headers/http.h
- iqn5HuY54xYRncFTjLQB6CcMbpY=
+ Ktagv9lGeWgtG9Tge8QQL6NMspc=
Headers/httperr.h
- AolyWtHI8Y0NmY8diKYtvWjct+U=
+ DXmVVJPwJRGSEZdwocYaihUkcMM=
Headers/idea.h
@@ -298,7 +298,7 @@
Headers/lhash.h
- PgUeXT+TG+vS7+7Zg5kwdmtHF7M=
+ aPN5seCrsrEnqx9e/7lMAnYJ7js=
Headers/macros.h
@@ -326,7 +326,7 @@
Headers/obj_mac.h
- eTx8IurZN7tVu4hYlw/OjmcTMU4=
+ +Fe0JwOUvmyd4z0xGEpkegHCn2A=
Headers/objects.h
@@ -350,7 +350,7 @@
Headers/opensslv.h
- 8DC2PPQEp9NfoIYkZVAYlMKlmU4=
+ jGa77uZfMsb0DqLSVwBPQ0KDWac=
Headers/ossl_typ.h
@@ -386,7 +386,7 @@
Headers/pkcs7.h
- klUHME98kAar+DN4RqP/9F2nqgA=
+ Chwdc/SINGThYh+on+ga5mSkmls=
Headers/pkcs7err.h
@@ -406,7 +406,7 @@
Headers/quic.h
- FT7e2yALtA5OrfVSMXVnHbyvNT0=
+ 9ocgTUMEYSxcQ5RvfdtIR/E9I3Q=
Headers/rand.h
@@ -450,7 +450,7 @@
Headers/self_test.h
- QPR0wJcMnlUQg9wuqG/0SaOxdaI=
+ trEZmScMCm1QUXB647KLRL7eKpM=
Headers/sha.h
@@ -470,7 +470,7 @@
Headers/ssl.h
- oyeWTq8IGSgBXlBoTSd/wpy5Og4=
+ XCC2K4VnOSwM6zhcxcVPhTa1+qw=
Headers/ssl2.h
@@ -482,11 +482,11 @@
Headers/sslerr.h
- /eBMsgFyNFsW6ny0bkuBwgLrV74=
+ UeaJVIPl4vB912T3mUSgbH8zocs=
Headers/sslerr_legacy.h
- 6gpgGTeSU+IJ6H2NFelNPevTivw=
+ z3f5UfOZy1Pr5VQlQIeIN6u+nTQ=
Headers/stack.h
@@ -550,7 +550,7 @@
Headers/x509_vfy.h
- 8na6aklL2A7onuXeMTRthbXhwOk=
+ TGiLnQ1ntrkRA4Vyv8sD8akW1bM=
Headers/x509err.h
@@ -566,7 +566,7 @@
Info.plist
- HLzm/NeSNfFVhCsA8UzYIsaUqHM=
+ BaBjJFDy/wmh+4hCtvTo+wR8/t4=
Modules/module.modulemap
@@ -604,7 +604,7 @@
hash2
- +/yNFfu/wp6fLt3mgcfkvmaDd+r5boSy4XF+MjICuSY=
+ VWNHVmMz+VR8twI6kxgnpqYi4b2+xUT85PgqwPx7nxA=
Headers/asn1t.h
@@ -632,7 +632,7 @@
hash2
- UghErHYW+0e26vpZ8A6M15d+wM1L6vitWGaO52tS3LU=
+ aNmhfUY1kzX6kUao1ZbmKUzq+Lvf7OBJr3YX2fRmrc8=
Headers/bioerr.h
@@ -702,7 +702,7 @@
hash2
- 2CJ2luMqLO3PwnQg6ZGa66TuLoxHb/ItalzbI+m200o=
+ wNcNCnyFLkHvpYuvSkTazYfRYe7AfbZIgIMRKj9GQvg=
Headers/cmp_util.h
@@ -716,7 +716,7 @@
hash2
- y0wIldwrV+MikpCTtCzbxTxw8qt+0NKfZiZTlKTQZmw=
+ p1TUonUahk3y3YQ7PVAefhGAukbsPwA2n+rf8L9Wrtw=
Headers/cms.h
@@ -751,7 +751,7 @@
hash2
- qSBdcYYyXPkWJHt2hAkBtdCI6WF3w6b3pK5Lnhy4qJA=
+ AAfy70I9dbT6gzoNCcii/GRRH2wo+H7E9v7pxXI65u8=
Headers/conf_api.h
@@ -772,7 +772,7 @@
hash2
- IpHQkJF4VaqWvnjuBwDTpgPit005UE7TD1zcMBHXGV0=
+ GzGZPhjWponkERprdtYtXJ3Qe5xq4pjL32P/iKMmkTQ=
Headers/conftypes.h
@@ -793,14 +793,14 @@
hash2
- bqxsbb8kIjJRLTSEiReczoXgM8AmmZhmuh5EYdSyG8E=
+ Sp5odARjo/XNrHMX/yASTR4ZruivYJAt1JHUuJerUdk=
Headers/core_names.h
hash2
- HELvq06+G42d2nagLGBmpn2olPiLOFv5imU6+kbDotY=
+ 20NML2u3NTGQtl+VRW6+HQoZN+AWOOskAEL5sUIq87o=
Headers/core_object.h
@@ -884,7 +884,7 @@
hash2
- DYD5Oy3aWijGe/9exmBzUQjsRviV+WOwk+W6d3+ymbg=
+ 2u3uwLnAXMXU9SJsWZ8Nsx1a5AGj6xsvjMTEP6IM5rU=
Headers/dherr.h
@@ -996,7 +996,7 @@
hash2
- OtC2kONUwoUIukUDUzK/VgXWtzJA6mtPYYrXe6Jgmkw=
+ HGTyfGzzLPsIKcaG2FNmiRO4uFhTGlAsrT6eom9Ume4=
Headers/ess.h
@@ -1017,7 +1017,7 @@
hash2
- pcZ7SZve6yJx+g54liiQLaNZWKc9OaGjam7DBVALzTo=
+ bBP/yyeKJulnw80h8EQiAvri81GImsfHAo6VyiNHBG0=
Headers/evperr.h
@@ -1052,21 +1052,21 @@
hash2
- 1AuWJMq0cOr2d8CoejccY6gWVJ8jcdPhfVrGQ639yCk=
+ RNEFfAUEGkrdluJQcEqXg73fqD3+FuSLvdwFOUwMhEg=
Headers/http.h
hash2
- 6gY6xX3VRsijDfDPVaXWpkMuYE5/FDGmx8RMlWoVyrA=
+ 6QawN2mWrMaCA0j49FXrX5fS7HqmHpPzHRDRF0fGSas=
Headers/httperr.h
hash2
- I1NXAExcjuFb6kAWvWdGvRbAeDHMjdzRAuV0tztU8mw=
+ ixjSEzRC1FDdkK34N/zAJ/XZOCDxLBYj49XKpYU8QnU=
Headers/idea.h
@@ -1094,7 +1094,7 @@
hash2
- F2f4RxI9RmbLe5nXWa0/5D4erEFG7nEjltJJrRYgyjo=
+ Jl5M1iNpQEqCt/a334+5FPd6GNzDHqPKIswNxpYj+Z0=
Headers/macros.h
@@ -1143,7 +1143,7 @@
hash2
- waWImVMklfmf08QW1xgZF5Zjpm++Jy9ku5CrBX+g5VA=
+ 32OpijQKu7446TvK4KPUCCGXw59Is8+AvFM7dE1vUhU=
Headers/objects.h
@@ -1185,7 +1185,7 @@
hash2
- Qq2srRiduNulAmYB7zq68KxM32jsk2pG5P+nKjK2OzA=
+ p6LhV60TVRXwvH9R1DQe0IpqY6Q2BRQRv7LUsRX6pR0=
Headers/ossl_typ.h
@@ -1248,7 +1248,7 @@
hash2
- CarN2EEspNpsc09r+tlmsQJxBfrw30RRvfID5lp66l4=
+ zCkInveoZF+oA9Ecw8R0zToureuVvTv0CCi7Y0YIIag=
Headers/pkcs7err.h
@@ -1283,7 +1283,7 @@
hash2
- H1ZKGkL90zXDNitZ4DTwoubpZx7Bcnw9Zm/FuND0f8k=
+ SPkcihq/KH6nlnvGCQHHulj0PnU5yzsNIZF5VomaUCA=
Headers/rand.h
@@ -1360,7 +1360,7 @@
hash2
- 7AcNZC/dRld/Vqa7OQqbCZw48yS6sbbKWiH+ZzgW80I=
+ aulEBHsw394UeVzbz8W8Rg9C+u2+HXqFA/iucCZzEfk=
Headers/sha.h
@@ -1395,7 +1395,7 @@
hash2
- WXSPtaTG3LWWKmUossQktztKYatlNzLIXsQHMX5UyAI=
+ 6fI3N7bm56Upx28YxoU60PY63Ya+7Sr0IW9DaKoT2QI=
Headers/ssl2.h
@@ -1416,14 +1416,14 @@
hash2
- 5N6b5J1x19nRahdCyVy23rl9iDkTxUg2n7yY/u6Atz0=
+ Y9HnuHhWu2gJyronyfx+RvbErDLNYfqG2Mt0P+E8d10=
Headers/sslerr_legacy.h
hash2
- tffJJERmZ986wfYNiRq5flAolrhG3Lk5spcb9GTx/pE=
+ 6EGptM0651unRpZEtW7yVfaElRYn+qtFVdKUbAFNaiw=
Headers/stack.h
@@ -1535,7 +1535,7 @@
hash2
- TDUYtTBN2AsRGiamZQ7R/kcg8jZe/p+yiUC37ePuH+c=
+ D3unJ/MBRVbQMy7KA6zzZ7LwZT99yhIEnFVQbKgQthg=
Headers/x509err.h
diff --git a/Makefile b/Makefile
index de747d36..bea1dbbf 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
.EXPORT_ALL_VARIABLES:
-OPENSSL_VERSION=3.2.2
+OPENSSL_VERSION=3.3.1
IPHONEOS_DEPLOYMENT_VERSION=12.0
MACOSX_DEPLOYMENT_TARGET=10.15
XROS_DEPLOYMENT_VERSION=1.0
diff --git a/OpenSSL-Universal.podspec b/OpenSSL-Universal.podspec
index eb00c43a..d9202cb2 100644
--- a/OpenSSL-Universal.podspec
+++ b/OpenSSL-Universal.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "OpenSSL-Universal"
- s.version = "3.2.2000" # 3.2.2
+ s.version = "3.3.1000" # 3.3.1
s.summary = "OpenSSL for iOS, macOS, tvOS, visionOS, watchOS"
s.description = "OpenSSL is an SSL/TLS and Crypto toolkit. Deprecated in macOS and gone in iOS, this spec gives your project non-deprecated OpenSSL support. Supports macOS, iOS, tvOS, visionOS, watchOS including Simulator (armv7s, arm64, x86_64)."
s.homepage = "https://github.com/krzyzanowskim/OpenSSL"
diff --git a/OpenSSL.json b/OpenSSL.json
index f3644986..82e49211 100644
--- a/OpenSSL.json
+++ b/OpenSSL.json
@@ -1,4 +1,5 @@
{
+ "3.3.1000": "https://github.com/krzyzanowskim/OpenSSL/releases/download/3.3.1000/OpenSSL.xcframework.zip",
"3.2.2000": "https://github.com/krzyzanowskim/OpenSSL/releases/download/3.2.2000/OpenSSL.xcframework.zip",
"3.1.6000": "https://github.com/krzyzanowskim/OpenSSL/releases/download/3.1.6000/OpenSSL.xcframework.zip",
"3.1.5007": "https://github.com/krzyzanowskim/OpenSSL/releases/download/3.1.5007/OpenSSL.xcframework.zip",
diff --git a/OpenSSL.xcodeproj/project.pbxproj b/OpenSSL.xcodeproj/project.pbxproj
index f156ee50..6abb7002 100644
--- a/OpenSSL.xcodeproj/project.pbxproj
+++ b/OpenSSL.xcodeproj/project.pbxproj
@@ -6827,7 +6827,7 @@
"$(inherited)",
"$(SRCROOT)/watchos/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -6882,7 +6882,7 @@
"$(inherited)",
"$(SRCROOT)/watchsimulator/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -6932,7 +6932,7 @@
"$(inherited)",
"$(SRCROOT)/visionsimulator/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -6983,7 +6983,7 @@
"$(inherited)",
"$(SRCROOT)/appletvsimulator/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -7034,7 +7034,7 @@
"$(inherited)",
"$(SRCROOT)/watchos/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -7086,7 +7086,7 @@
"$(inherited)",
"$(SRCROOT)/iphoneos/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -7139,7 +7139,7 @@
"$(inherited)",
"$(SRCROOT)/appletvsimulator/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -7197,7 +7197,7 @@
"$(SRCROOT)/macosx/lib",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -7303,7 +7303,7 @@
"$(inherited)",
"$(SRCROOT)/visionos/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -7402,7 +7402,7 @@
"$(inherited)",
"$(SRCROOT)/visionsimulator/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -7459,7 +7459,7 @@
"$(inherited)",
"$(SRCROOT)/macosx_catalyst/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -7517,7 +7517,7 @@
"$(inherited)",
"$(SRCROOT)/macosx_catalyst/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -7570,7 +7570,7 @@
"$(inherited)",
"$(SRCROOT)/iphonesimulator/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -7618,7 +7618,7 @@
"$(inherited)",
"$(SRCROOT)/visionos/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -7673,7 +7673,7 @@
"$(inherited)",
"$(SRCROOT)/appletvos/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -7728,7 +7728,7 @@
"$(inherited)",
"$(SRCROOT)/watchsimulator/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -7782,7 +7782,7 @@
"$(SRCROOT)/macosx/lib",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -7831,7 +7831,7 @@
"$(inherited)",
"$(SRCROOT)/iphoneos/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -7889,7 +7889,7 @@
"$(inherited)",
"$(SRCROOT)/iphonesimulator/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
@@ -7946,7 +7946,7 @@
"$(inherited)",
"$(SRCROOT)/appletvos/lib",
);
- MARKETING_VERSION = 3.2.2000;
+ MARKETING_VERSION = 3.3.1000;
OTHER_LDFLAGS = "-Xlinker -all_load";
PRODUCT_BUNDLE_IDENTIFIER = com.github.krzyzanowskim.OpenSSL;
PRODUCT_NAME = OpenSSL;
diff --git a/Project.swift b/Project.swift
index 2699c692..bac3220c 100644
--- a/Project.swift
+++ b/Project.swift
@@ -1,7 +1,7 @@
import ProjectDescription
private let developmentTeam: SettingValue = "67RAULRX93"
-private let marketingVersion: String = "3.2.2000"
+private let marketingVersion: String = "3.3.1000"
let project = Project(
name: "OpenSSL",
diff --git a/README.md b/README.md
index 74384528..0d2a4600 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ I advised you to use [OpenSSL-Package](https://github.com/krzyzanowskim/OpenSSL-
```swift
dependencies: [
- .package(url: "https://github.com/krzyzanowskim/OpenSSL-Package.git", from: "3.2.2000")
+ .package(url: "https://github.com/krzyzanowskim/OpenSSL-Package.git", from: "3.3.1000")
]
```
diff --git a/appletvos/include/OpenSSL/asn1err.h b/appletvos/include/OpenSSL/asn1err.h
index 4e6d052f..23dab986 100644
--- a/appletvos/include/OpenSSL/asn1err.h
+++ b/appletvos/include/OpenSSL/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/appletvos/include/OpenSSL/bio.h b/appletvos/include/OpenSSL/bio.h
index 377fd310..eb91d61c 100644
--- a/appletvos/include/OpenSSL/bio.h
+++ b/appletvos/include/OpenSSL/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/appletvos/include/OpenSSL/cmp.h b/appletvos/include/OpenSSL/cmp.h
index 342adaef..829d334d 100644
--- a/appletvos/include/OpenSSL/cmp.h
+++ b/appletvos/include/OpenSSL/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/appletvos/include/OpenSSL/cmperr.h b/appletvos/include/OpenSSL/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/appletvos/include/OpenSSL/cmperr.h
+++ b/appletvos/include/OpenSSL/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/appletvos/include/OpenSSL/conf.h b/appletvos/include/OpenSSL/conf.h
index 581f435d..d99085b6 100644
--- a/appletvos/include/OpenSSL/conf.h
+++ b/appletvos/include/OpenSSL/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/appletvos/include/OpenSSL/configuration.h b/appletvos/include/OpenSSL/configuration.h
index e53c0dac..ec23fdc0 100644
--- a/appletvos/include/OpenSSL/configuration.h
+++ b/appletvos/include/OpenSSL/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_tvOS
# define OPENSSL_SYS_tvOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/appletvos/include/OpenSSL/core_dispatch.h b/appletvos/include/OpenSSL/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/appletvos/include/OpenSSL/core_dispatch.h
+++ b/appletvos/include/OpenSSL/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/appletvos/include/OpenSSL/core_names.h b/appletvos/include/OpenSSL/core_names.h
index ffffe90f..a6158056 100644
--- a/appletvos/include/OpenSSL/core_names.h
+++ b/appletvos/include/OpenSSL/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/appletvos/include/OpenSSL/dh.h b/appletvos/include/OpenSSL/dh.h
index 50617e9e..c20ecb75 100644
--- a/appletvos/include/OpenSSL/dh.h
+++ b/appletvos/include/OpenSSL/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/appletvos/include/OpenSSL/err.h b/appletvos/include/OpenSSL/err.h
index 42124abc..6b4f4165 100644
--- a/appletvos/include/OpenSSL/err.h
+++ b/appletvos/include/OpenSSL/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/appletvos/include/OpenSSL/evp.h b/appletvos/include/OpenSSL/evp.h
index c8290eba..1716f700 100644
--- a/appletvos/include/OpenSSL/evp.h
+++ b/appletvos/include/OpenSSL/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/appletvos/include/OpenSSL/hpke.h b/appletvos/include/OpenSSL/hpke.h
index e7155e4a..adefc552 100644
--- a/appletvos/include/OpenSSL/hpke.h
+++ b/appletvos/include/OpenSSL/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/appletvos/include/OpenSSL/http.h b/appletvos/include/OpenSSL/http.h
index d33cc797..d3d786f0 100644
--- a/appletvos/include/OpenSSL/http.h
+++ b/appletvos/include/OpenSSL/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/appletvos/include/OpenSSL/httperr.h b/appletvos/include/OpenSSL/httperr.h
index 70719671..d0aa82fb 100644
--- a/appletvos/include/OpenSSL/httperr.h
+++ b/appletvos/include/OpenSSL/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/appletvos/include/OpenSSL/lhash.h b/appletvos/include/OpenSSL/lhash.h
index ea77b654..612121fd 100644
--- a/appletvos/include/OpenSSL/lhash.h
+++ b/appletvos/include/OpenSSL/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/appletvos/include/OpenSSL/obj_mac.h b/appletvos/include/OpenSSL/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/appletvos/include/OpenSSL/obj_mac.h
+++ b/appletvos/include/OpenSSL/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/appletvos/include/OpenSSL/opensslv.h b/appletvos/include/OpenSSL/opensslv.h
index b3e2dc41..236448d7 100644
--- a/appletvos/include/OpenSSL/opensslv.h
+++ b/appletvos/include/OpenSSL/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/appletvos/include/OpenSSL/pkcs7.h b/appletvos/include/OpenSSL/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/appletvos/include/OpenSSL/pkcs7.h
+++ b/appletvos/include/OpenSSL/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/appletvos/include/OpenSSL/quic.h b/appletvos/include/OpenSSL/quic.h
index 10aa86fc..79200a8c 100644
--- a/appletvos/include/OpenSSL/quic.h
+++ b/appletvos/include/OpenSSL/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/appletvos/include/OpenSSL/self_test.h b/appletvos/include/OpenSSL/self_test.h
index 11ef0da3..46a024d9 100644
--- a/appletvos/include/OpenSSL/self_test.h
+++ b/appletvos/include/OpenSSL/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/appletvos/include/OpenSSL/ssl.h b/appletvos/include/OpenSSL/ssl.h
index 0dbadf2f..006d063e 100644
--- a/appletvos/include/OpenSSL/ssl.h
+++ b/appletvos/include/OpenSSL/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/appletvos/include/OpenSSL/sslerr.h b/appletvos/include/OpenSSL/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/appletvos/include/OpenSSL/sslerr.h
+++ b/appletvos/include/OpenSSL/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/appletvos/include/OpenSSL/sslerr_legacy.h b/appletvos/include/OpenSSL/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/appletvos/include/OpenSSL/sslerr_legacy.h
+++ b/appletvos/include/OpenSSL/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/appletvos/include/OpenSSL/x509_vfy.h b/appletvos/include/OpenSSL/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/appletvos/include/OpenSSL/x509_vfy.h
+++ b/appletvos/include/OpenSSL/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/appletvos/lib/libcrypto.a b/appletvos/lib/libcrypto.a
index 7036453f..b83825e7 100644
Binary files a/appletvos/lib/libcrypto.a and b/appletvos/lib/libcrypto.a differ
diff --git a/appletvos/lib/libssl.a b/appletvos/lib/libssl.a
index 41575820..b5fac483 100644
Binary files a/appletvos/lib/libssl.a and b/appletvos/lib/libssl.a differ
diff --git a/appletvsimulator/include/OpenSSL/asn1err.h b/appletvsimulator/include/OpenSSL/asn1err.h
index 4e6d052f..23dab986 100644
--- a/appletvsimulator/include/OpenSSL/asn1err.h
+++ b/appletvsimulator/include/OpenSSL/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/appletvsimulator/include/OpenSSL/bio.h b/appletvsimulator/include/OpenSSL/bio.h
index 377fd310..eb91d61c 100644
--- a/appletvsimulator/include/OpenSSL/bio.h
+++ b/appletvsimulator/include/OpenSSL/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/appletvsimulator/include/OpenSSL/cmp.h b/appletvsimulator/include/OpenSSL/cmp.h
index 342adaef..829d334d 100644
--- a/appletvsimulator/include/OpenSSL/cmp.h
+++ b/appletvsimulator/include/OpenSSL/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/appletvsimulator/include/OpenSSL/cmperr.h b/appletvsimulator/include/OpenSSL/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/appletvsimulator/include/OpenSSL/cmperr.h
+++ b/appletvsimulator/include/OpenSSL/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/appletvsimulator/include/OpenSSL/conf.h b/appletvsimulator/include/OpenSSL/conf.h
index 581f435d..d99085b6 100644
--- a/appletvsimulator/include/OpenSSL/conf.h
+++ b/appletvsimulator/include/OpenSSL/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/appletvsimulator/include/OpenSSL/configuration.h b/appletvsimulator/include/OpenSSL/configuration.h
index e53c0dac..ec23fdc0 100644
--- a/appletvsimulator/include/OpenSSL/configuration.h
+++ b/appletvsimulator/include/OpenSSL/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_tvOS
# define OPENSSL_SYS_tvOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/appletvsimulator/include/OpenSSL/core_dispatch.h b/appletvsimulator/include/OpenSSL/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/appletvsimulator/include/OpenSSL/core_dispatch.h
+++ b/appletvsimulator/include/OpenSSL/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/appletvsimulator/include/OpenSSL/core_names.h b/appletvsimulator/include/OpenSSL/core_names.h
index ffffe90f..a6158056 100644
--- a/appletvsimulator/include/OpenSSL/core_names.h
+++ b/appletvsimulator/include/OpenSSL/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/appletvsimulator/include/OpenSSL/dh.h b/appletvsimulator/include/OpenSSL/dh.h
index 50617e9e..c20ecb75 100644
--- a/appletvsimulator/include/OpenSSL/dh.h
+++ b/appletvsimulator/include/OpenSSL/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/appletvsimulator/include/OpenSSL/err.h b/appletvsimulator/include/OpenSSL/err.h
index 42124abc..6b4f4165 100644
--- a/appletvsimulator/include/OpenSSL/err.h
+++ b/appletvsimulator/include/OpenSSL/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/appletvsimulator/include/OpenSSL/evp.h b/appletvsimulator/include/OpenSSL/evp.h
index c8290eba..1716f700 100644
--- a/appletvsimulator/include/OpenSSL/evp.h
+++ b/appletvsimulator/include/OpenSSL/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/appletvsimulator/include/OpenSSL/hpke.h b/appletvsimulator/include/OpenSSL/hpke.h
index e7155e4a..adefc552 100644
--- a/appletvsimulator/include/OpenSSL/hpke.h
+++ b/appletvsimulator/include/OpenSSL/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/appletvsimulator/include/OpenSSL/http.h b/appletvsimulator/include/OpenSSL/http.h
index d33cc797..d3d786f0 100644
--- a/appletvsimulator/include/OpenSSL/http.h
+++ b/appletvsimulator/include/OpenSSL/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/appletvsimulator/include/OpenSSL/httperr.h b/appletvsimulator/include/OpenSSL/httperr.h
index 70719671..d0aa82fb 100644
--- a/appletvsimulator/include/OpenSSL/httperr.h
+++ b/appletvsimulator/include/OpenSSL/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/appletvsimulator/include/OpenSSL/lhash.h b/appletvsimulator/include/OpenSSL/lhash.h
index ea77b654..612121fd 100644
--- a/appletvsimulator/include/OpenSSL/lhash.h
+++ b/appletvsimulator/include/OpenSSL/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/appletvsimulator/include/OpenSSL/obj_mac.h b/appletvsimulator/include/OpenSSL/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/appletvsimulator/include/OpenSSL/obj_mac.h
+++ b/appletvsimulator/include/OpenSSL/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/appletvsimulator/include/OpenSSL/opensslv.h b/appletvsimulator/include/OpenSSL/opensslv.h
index b3e2dc41..236448d7 100644
--- a/appletvsimulator/include/OpenSSL/opensslv.h
+++ b/appletvsimulator/include/OpenSSL/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/appletvsimulator/include/OpenSSL/pkcs7.h b/appletvsimulator/include/OpenSSL/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/appletvsimulator/include/OpenSSL/pkcs7.h
+++ b/appletvsimulator/include/OpenSSL/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/appletvsimulator/include/OpenSSL/quic.h b/appletvsimulator/include/OpenSSL/quic.h
index 10aa86fc..79200a8c 100644
--- a/appletvsimulator/include/OpenSSL/quic.h
+++ b/appletvsimulator/include/OpenSSL/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/appletvsimulator/include/OpenSSL/self_test.h b/appletvsimulator/include/OpenSSL/self_test.h
index 11ef0da3..46a024d9 100644
--- a/appletvsimulator/include/OpenSSL/self_test.h
+++ b/appletvsimulator/include/OpenSSL/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/appletvsimulator/include/OpenSSL/ssl.h b/appletvsimulator/include/OpenSSL/ssl.h
index 0dbadf2f..006d063e 100644
--- a/appletvsimulator/include/OpenSSL/ssl.h
+++ b/appletvsimulator/include/OpenSSL/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/appletvsimulator/include/OpenSSL/sslerr.h b/appletvsimulator/include/OpenSSL/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/appletvsimulator/include/OpenSSL/sslerr.h
+++ b/appletvsimulator/include/OpenSSL/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/appletvsimulator/include/OpenSSL/sslerr_legacy.h b/appletvsimulator/include/OpenSSL/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/appletvsimulator/include/OpenSSL/sslerr_legacy.h
+++ b/appletvsimulator/include/OpenSSL/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/appletvsimulator/include/OpenSSL/x509_vfy.h b/appletvsimulator/include/OpenSSL/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/appletvsimulator/include/OpenSSL/x509_vfy.h
+++ b/appletvsimulator/include/OpenSSL/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/appletvsimulator/lib/libcrypto.a b/appletvsimulator/lib/libcrypto.a
index f761c125..2989587e 100644
Binary files a/appletvsimulator/lib/libcrypto.a and b/appletvsimulator/lib/libcrypto.a differ
diff --git a/appletvsimulator/lib/libssl.a b/appletvsimulator/lib/libssl.a
index d185656a..943592a9 100644
Binary files a/appletvsimulator/lib/libssl.a and b/appletvsimulator/lib/libssl.a differ
diff --git a/iphoneos/include/OpenSSL/asn1err.h b/iphoneos/include/OpenSSL/asn1err.h
index 4e6d052f..23dab986 100644
--- a/iphoneos/include/OpenSSL/asn1err.h
+++ b/iphoneos/include/OpenSSL/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/iphoneos/include/OpenSSL/bio.h b/iphoneos/include/OpenSSL/bio.h
index 377fd310..eb91d61c 100644
--- a/iphoneos/include/OpenSSL/bio.h
+++ b/iphoneos/include/OpenSSL/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/iphoneos/include/OpenSSL/cmp.h b/iphoneos/include/OpenSSL/cmp.h
index 342adaef..829d334d 100644
--- a/iphoneos/include/OpenSSL/cmp.h
+++ b/iphoneos/include/OpenSSL/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/iphoneos/include/OpenSSL/cmperr.h b/iphoneos/include/OpenSSL/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/iphoneos/include/OpenSSL/cmperr.h
+++ b/iphoneos/include/OpenSSL/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/iphoneos/include/OpenSSL/conf.h b/iphoneos/include/OpenSSL/conf.h
index 581f435d..d99085b6 100644
--- a/iphoneos/include/OpenSSL/conf.h
+++ b/iphoneos/include/OpenSSL/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/iphoneos/include/OpenSSL/configuration.h b/iphoneos/include/OpenSSL/configuration.h
index 09071376..1dacd74f 100644
--- a/iphoneos/include/OpenSSL/configuration.h
+++ b/iphoneos/include/OpenSSL/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_iOS
# define OPENSSL_SYS_iOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/iphoneos/include/OpenSSL/core_dispatch.h b/iphoneos/include/OpenSSL/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/iphoneos/include/OpenSSL/core_dispatch.h
+++ b/iphoneos/include/OpenSSL/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/iphoneos/include/OpenSSL/core_names.h b/iphoneos/include/OpenSSL/core_names.h
index ffffe90f..a6158056 100644
--- a/iphoneos/include/OpenSSL/core_names.h
+++ b/iphoneos/include/OpenSSL/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/iphoneos/include/OpenSSL/dh.h b/iphoneos/include/OpenSSL/dh.h
index 50617e9e..c20ecb75 100644
--- a/iphoneos/include/OpenSSL/dh.h
+++ b/iphoneos/include/OpenSSL/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/iphoneos/include/OpenSSL/err.h b/iphoneos/include/OpenSSL/err.h
index 42124abc..6b4f4165 100644
--- a/iphoneos/include/OpenSSL/err.h
+++ b/iphoneos/include/OpenSSL/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/iphoneos/include/OpenSSL/evp.h b/iphoneos/include/OpenSSL/evp.h
index c8290eba..1716f700 100644
--- a/iphoneos/include/OpenSSL/evp.h
+++ b/iphoneos/include/OpenSSL/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/iphoneos/include/OpenSSL/hpke.h b/iphoneos/include/OpenSSL/hpke.h
index e7155e4a..adefc552 100644
--- a/iphoneos/include/OpenSSL/hpke.h
+++ b/iphoneos/include/OpenSSL/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/iphoneos/include/OpenSSL/http.h b/iphoneos/include/OpenSSL/http.h
index d33cc797..d3d786f0 100644
--- a/iphoneos/include/OpenSSL/http.h
+++ b/iphoneos/include/OpenSSL/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/iphoneos/include/OpenSSL/httperr.h b/iphoneos/include/OpenSSL/httperr.h
index 70719671..d0aa82fb 100644
--- a/iphoneos/include/OpenSSL/httperr.h
+++ b/iphoneos/include/OpenSSL/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/iphoneos/include/OpenSSL/lhash.h b/iphoneos/include/OpenSSL/lhash.h
index ea77b654..612121fd 100644
--- a/iphoneos/include/OpenSSL/lhash.h
+++ b/iphoneos/include/OpenSSL/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/iphoneos/include/OpenSSL/obj_mac.h b/iphoneos/include/OpenSSL/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/iphoneos/include/OpenSSL/obj_mac.h
+++ b/iphoneos/include/OpenSSL/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/iphoneos/include/OpenSSL/opensslv.h b/iphoneos/include/OpenSSL/opensslv.h
index b3e2dc41..236448d7 100644
--- a/iphoneos/include/OpenSSL/opensslv.h
+++ b/iphoneos/include/OpenSSL/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/iphoneos/include/OpenSSL/pkcs7.h b/iphoneos/include/OpenSSL/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/iphoneos/include/OpenSSL/pkcs7.h
+++ b/iphoneos/include/OpenSSL/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/iphoneos/include/OpenSSL/quic.h b/iphoneos/include/OpenSSL/quic.h
index 10aa86fc..79200a8c 100644
--- a/iphoneos/include/OpenSSL/quic.h
+++ b/iphoneos/include/OpenSSL/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/iphoneos/include/OpenSSL/self_test.h b/iphoneos/include/OpenSSL/self_test.h
index 11ef0da3..46a024d9 100644
--- a/iphoneos/include/OpenSSL/self_test.h
+++ b/iphoneos/include/OpenSSL/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/iphoneos/include/OpenSSL/ssl.h b/iphoneos/include/OpenSSL/ssl.h
index 0dbadf2f..006d063e 100644
--- a/iphoneos/include/OpenSSL/ssl.h
+++ b/iphoneos/include/OpenSSL/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/iphoneos/include/OpenSSL/sslerr.h b/iphoneos/include/OpenSSL/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/iphoneos/include/OpenSSL/sslerr.h
+++ b/iphoneos/include/OpenSSL/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/iphoneos/include/OpenSSL/sslerr_legacy.h b/iphoneos/include/OpenSSL/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/iphoneos/include/OpenSSL/sslerr_legacy.h
+++ b/iphoneos/include/OpenSSL/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/iphoneos/include/OpenSSL/x509_vfy.h b/iphoneos/include/OpenSSL/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/iphoneos/include/OpenSSL/x509_vfy.h
+++ b/iphoneos/include/OpenSSL/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/iphoneos/lib/libcrypto.a b/iphoneos/lib/libcrypto.a
index 047111a8..52820094 100644
Binary files a/iphoneos/lib/libcrypto.a and b/iphoneos/lib/libcrypto.a differ
diff --git a/iphoneos/lib/libssl.a b/iphoneos/lib/libssl.a
index 8a253441..765ba4cc 100644
Binary files a/iphoneos/lib/libssl.a and b/iphoneos/lib/libssl.a differ
diff --git a/iphonesimulator/include/OpenSSL/asn1err.h b/iphonesimulator/include/OpenSSL/asn1err.h
index 4e6d052f..23dab986 100644
--- a/iphonesimulator/include/OpenSSL/asn1err.h
+++ b/iphonesimulator/include/OpenSSL/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/iphonesimulator/include/OpenSSL/bio.h b/iphonesimulator/include/OpenSSL/bio.h
index 377fd310..eb91d61c 100644
--- a/iphonesimulator/include/OpenSSL/bio.h
+++ b/iphonesimulator/include/OpenSSL/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/iphonesimulator/include/OpenSSL/cmp.h b/iphonesimulator/include/OpenSSL/cmp.h
index 342adaef..829d334d 100644
--- a/iphonesimulator/include/OpenSSL/cmp.h
+++ b/iphonesimulator/include/OpenSSL/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/iphonesimulator/include/OpenSSL/cmperr.h b/iphonesimulator/include/OpenSSL/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/iphonesimulator/include/OpenSSL/cmperr.h
+++ b/iphonesimulator/include/OpenSSL/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/iphonesimulator/include/OpenSSL/conf.h b/iphonesimulator/include/OpenSSL/conf.h
index 581f435d..d99085b6 100644
--- a/iphonesimulator/include/OpenSSL/conf.h
+++ b/iphonesimulator/include/OpenSSL/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/iphonesimulator/include/OpenSSL/configuration.h b/iphonesimulator/include/OpenSSL/configuration.h
index 09071376..1dacd74f 100644
--- a/iphonesimulator/include/OpenSSL/configuration.h
+++ b/iphonesimulator/include/OpenSSL/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_iOS
# define OPENSSL_SYS_iOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/iphonesimulator/include/OpenSSL/core_dispatch.h b/iphonesimulator/include/OpenSSL/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/iphonesimulator/include/OpenSSL/core_dispatch.h
+++ b/iphonesimulator/include/OpenSSL/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/iphonesimulator/include/OpenSSL/core_names.h b/iphonesimulator/include/OpenSSL/core_names.h
index ffffe90f..a6158056 100644
--- a/iphonesimulator/include/OpenSSL/core_names.h
+++ b/iphonesimulator/include/OpenSSL/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/iphonesimulator/include/OpenSSL/dh.h b/iphonesimulator/include/OpenSSL/dh.h
index 50617e9e..c20ecb75 100644
--- a/iphonesimulator/include/OpenSSL/dh.h
+++ b/iphonesimulator/include/OpenSSL/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/iphonesimulator/include/OpenSSL/err.h b/iphonesimulator/include/OpenSSL/err.h
index 42124abc..6b4f4165 100644
--- a/iphonesimulator/include/OpenSSL/err.h
+++ b/iphonesimulator/include/OpenSSL/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/iphonesimulator/include/OpenSSL/evp.h b/iphonesimulator/include/OpenSSL/evp.h
index c8290eba..1716f700 100644
--- a/iphonesimulator/include/OpenSSL/evp.h
+++ b/iphonesimulator/include/OpenSSL/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/iphonesimulator/include/OpenSSL/hpke.h b/iphonesimulator/include/OpenSSL/hpke.h
index e7155e4a..adefc552 100644
--- a/iphonesimulator/include/OpenSSL/hpke.h
+++ b/iphonesimulator/include/OpenSSL/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/iphonesimulator/include/OpenSSL/http.h b/iphonesimulator/include/OpenSSL/http.h
index d33cc797..d3d786f0 100644
--- a/iphonesimulator/include/OpenSSL/http.h
+++ b/iphonesimulator/include/OpenSSL/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/iphonesimulator/include/OpenSSL/httperr.h b/iphonesimulator/include/OpenSSL/httperr.h
index 70719671..d0aa82fb 100644
--- a/iphonesimulator/include/OpenSSL/httperr.h
+++ b/iphonesimulator/include/OpenSSL/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/iphonesimulator/include/OpenSSL/lhash.h b/iphonesimulator/include/OpenSSL/lhash.h
index ea77b654..612121fd 100644
--- a/iphonesimulator/include/OpenSSL/lhash.h
+++ b/iphonesimulator/include/OpenSSL/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/iphonesimulator/include/OpenSSL/obj_mac.h b/iphonesimulator/include/OpenSSL/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/iphonesimulator/include/OpenSSL/obj_mac.h
+++ b/iphonesimulator/include/OpenSSL/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/iphonesimulator/include/OpenSSL/opensslv.h b/iphonesimulator/include/OpenSSL/opensslv.h
index b3e2dc41..236448d7 100644
--- a/iphonesimulator/include/OpenSSL/opensslv.h
+++ b/iphonesimulator/include/OpenSSL/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/iphonesimulator/include/OpenSSL/pkcs7.h b/iphonesimulator/include/OpenSSL/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/iphonesimulator/include/OpenSSL/pkcs7.h
+++ b/iphonesimulator/include/OpenSSL/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/iphonesimulator/include/OpenSSL/quic.h b/iphonesimulator/include/OpenSSL/quic.h
index 10aa86fc..79200a8c 100644
--- a/iphonesimulator/include/OpenSSL/quic.h
+++ b/iphonesimulator/include/OpenSSL/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/iphonesimulator/include/OpenSSL/self_test.h b/iphonesimulator/include/OpenSSL/self_test.h
index 11ef0da3..46a024d9 100644
--- a/iphonesimulator/include/OpenSSL/self_test.h
+++ b/iphonesimulator/include/OpenSSL/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/iphonesimulator/include/OpenSSL/ssl.h b/iphonesimulator/include/OpenSSL/ssl.h
index 0dbadf2f..006d063e 100644
--- a/iphonesimulator/include/OpenSSL/ssl.h
+++ b/iphonesimulator/include/OpenSSL/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/iphonesimulator/include/OpenSSL/sslerr.h b/iphonesimulator/include/OpenSSL/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/iphonesimulator/include/OpenSSL/sslerr.h
+++ b/iphonesimulator/include/OpenSSL/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/iphonesimulator/include/OpenSSL/sslerr_legacy.h b/iphonesimulator/include/OpenSSL/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/iphonesimulator/include/OpenSSL/sslerr_legacy.h
+++ b/iphonesimulator/include/OpenSSL/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/iphonesimulator/include/OpenSSL/x509_vfy.h b/iphonesimulator/include/OpenSSL/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/iphonesimulator/include/OpenSSL/x509_vfy.h
+++ b/iphonesimulator/include/OpenSSL/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/iphonesimulator/lib/libcrypto.a b/iphonesimulator/lib/libcrypto.a
index c8edecde..054e1fd5 100644
Binary files a/iphonesimulator/lib/libcrypto.a and b/iphonesimulator/lib/libcrypto.a differ
diff --git a/iphonesimulator/lib/libssl.a b/iphonesimulator/lib/libssl.a
index 3d6e6cb5..0209bfd1 100644
Binary files a/iphonesimulator/lib/libssl.a and b/iphonesimulator/lib/libssl.a differ
diff --git a/macosx/include/OpenSSL/asn1err.h b/macosx/include/OpenSSL/asn1err.h
index 4e6d052f..23dab986 100644
--- a/macosx/include/OpenSSL/asn1err.h
+++ b/macosx/include/OpenSSL/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/macosx/include/OpenSSL/bio.h b/macosx/include/OpenSSL/bio.h
index 377fd310..eb91d61c 100644
--- a/macosx/include/OpenSSL/bio.h
+++ b/macosx/include/OpenSSL/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/macosx/include/OpenSSL/cmp.h b/macosx/include/OpenSSL/cmp.h
index 342adaef..829d334d 100644
--- a/macosx/include/OpenSSL/cmp.h
+++ b/macosx/include/OpenSSL/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/macosx/include/OpenSSL/cmperr.h b/macosx/include/OpenSSL/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/macosx/include/OpenSSL/cmperr.h
+++ b/macosx/include/OpenSSL/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/macosx/include/OpenSSL/conf.h b/macosx/include/OpenSSL/conf.h
index 581f435d..d99085b6 100644
--- a/macosx/include/OpenSSL/conf.h
+++ b/macosx/include/OpenSSL/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/macosx/include/OpenSSL/configuration.h b/macosx/include/OpenSSL/configuration.h
index 9eac98ec..775e0c38 100644
--- a/macosx/include/OpenSSL/configuration.h
+++ b/macosx/include/OpenSSL/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_MacOSX
# define OPENSSL_SYS_MacOSX 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/macosx/include/OpenSSL/core_dispatch.h b/macosx/include/OpenSSL/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/macosx/include/OpenSSL/core_dispatch.h
+++ b/macosx/include/OpenSSL/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/macosx/include/OpenSSL/core_names.h b/macosx/include/OpenSSL/core_names.h
index ffffe90f..a6158056 100644
--- a/macosx/include/OpenSSL/core_names.h
+++ b/macosx/include/OpenSSL/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/macosx/include/OpenSSL/dh.h b/macosx/include/OpenSSL/dh.h
index 50617e9e..c20ecb75 100644
--- a/macosx/include/OpenSSL/dh.h
+++ b/macosx/include/OpenSSL/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/macosx/include/OpenSSL/err.h b/macosx/include/OpenSSL/err.h
index 42124abc..6b4f4165 100644
--- a/macosx/include/OpenSSL/err.h
+++ b/macosx/include/OpenSSL/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/macosx/include/OpenSSL/evp.h b/macosx/include/OpenSSL/evp.h
index c8290eba..1716f700 100644
--- a/macosx/include/OpenSSL/evp.h
+++ b/macosx/include/OpenSSL/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/macosx/include/OpenSSL/hpke.h b/macosx/include/OpenSSL/hpke.h
index e7155e4a..adefc552 100644
--- a/macosx/include/OpenSSL/hpke.h
+++ b/macosx/include/OpenSSL/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/macosx/include/OpenSSL/http.h b/macosx/include/OpenSSL/http.h
index d33cc797..d3d786f0 100644
--- a/macosx/include/OpenSSL/http.h
+++ b/macosx/include/OpenSSL/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/macosx/include/OpenSSL/httperr.h b/macosx/include/OpenSSL/httperr.h
index 70719671..d0aa82fb 100644
--- a/macosx/include/OpenSSL/httperr.h
+++ b/macosx/include/OpenSSL/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/macosx/include/OpenSSL/lhash.h b/macosx/include/OpenSSL/lhash.h
index ea77b654..612121fd 100644
--- a/macosx/include/OpenSSL/lhash.h
+++ b/macosx/include/OpenSSL/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/macosx/include/OpenSSL/obj_mac.h b/macosx/include/OpenSSL/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/macosx/include/OpenSSL/obj_mac.h
+++ b/macosx/include/OpenSSL/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/macosx/include/OpenSSL/opensslv.h b/macosx/include/OpenSSL/opensslv.h
index b3e2dc41..236448d7 100644
--- a/macosx/include/OpenSSL/opensslv.h
+++ b/macosx/include/OpenSSL/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/macosx/include/OpenSSL/pkcs7.h b/macosx/include/OpenSSL/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/macosx/include/OpenSSL/pkcs7.h
+++ b/macosx/include/OpenSSL/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/macosx/include/OpenSSL/quic.h b/macosx/include/OpenSSL/quic.h
index 10aa86fc..79200a8c 100644
--- a/macosx/include/OpenSSL/quic.h
+++ b/macosx/include/OpenSSL/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/macosx/include/OpenSSL/self_test.h b/macosx/include/OpenSSL/self_test.h
index 11ef0da3..46a024d9 100644
--- a/macosx/include/OpenSSL/self_test.h
+++ b/macosx/include/OpenSSL/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/macosx/include/OpenSSL/ssl.h b/macosx/include/OpenSSL/ssl.h
index 0dbadf2f..006d063e 100644
--- a/macosx/include/OpenSSL/ssl.h
+++ b/macosx/include/OpenSSL/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/macosx/include/OpenSSL/sslerr.h b/macosx/include/OpenSSL/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/macosx/include/OpenSSL/sslerr.h
+++ b/macosx/include/OpenSSL/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/macosx/include/OpenSSL/sslerr_legacy.h b/macosx/include/OpenSSL/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/macosx/include/OpenSSL/sslerr_legacy.h
+++ b/macosx/include/OpenSSL/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/macosx/include/OpenSSL/x509_vfy.h b/macosx/include/OpenSSL/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/macosx/include/OpenSSL/x509_vfy.h
+++ b/macosx/include/OpenSSL/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/macosx/lib/libcrypto.a b/macosx/lib/libcrypto.a
index 12ca8f9d..a9943b72 100644
Binary files a/macosx/lib/libcrypto.a and b/macosx/lib/libcrypto.a differ
diff --git a/macosx/lib/libssl.a b/macosx/lib/libssl.a
index 87da22aa..0b4da505 100644
Binary files a/macosx/lib/libssl.a and b/macosx/lib/libssl.a differ
diff --git a/macosx_catalyst/include/OpenSSL/asn1err.h b/macosx_catalyst/include/OpenSSL/asn1err.h
index 4e6d052f..23dab986 100644
--- a/macosx_catalyst/include/OpenSSL/asn1err.h
+++ b/macosx_catalyst/include/OpenSSL/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/macosx_catalyst/include/OpenSSL/bio.h b/macosx_catalyst/include/OpenSSL/bio.h
index 377fd310..eb91d61c 100644
--- a/macosx_catalyst/include/OpenSSL/bio.h
+++ b/macosx_catalyst/include/OpenSSL/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/macosx_catalyst/include/OpenSSL/cmp.h b/macosx_catalyst/include/OpenSSL/cmp.h
index 342adaef..829d334d 100644
--- a/macosx_catalyst/include/OpenSSL/cmp.h
+++ b/macosx_catalyst/include/OpenSSL/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/macosx_catalyst/include/OpenSSL/cmperr.h b/macosx_catalyst/include/OpenSSL/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/macosx_catalyst/include/OpenSSL/cmperr.h
+++ b/macosx_catalyst/include/OpenSSL/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/macosx_catalyst/include/OpenSSL/conf.h b/macosx_catalyst/include/OpenSSL/conf.h
index 581f435d..d99085b6 100644
--- a/macosx_catalyst/include/OpenSSL/conf.h
+++ b/macosx_catalyst/include/OpenSSL/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/macosx_catalyst/include/OpenSSL/configuration.h b/macosx_catalyst/include/OpenSSL/configuration.h
index 9eac98ec..775e0c38 100644
--- a/macosx_catalyst/include/OpenSSL/configuration.h
+++ b/macosx_catalyst/include/OpenSSL/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_MacOSX
# define OPENSSL_SYS_MacOSX 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/macosx_catalyst/include/OpenSSL/core_dispatch.h b/macosx_catalyst/include/OpenSSL/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/macosx_catalyst/include/OpenSSL/core_dispatch.h
+++ b/macosx_catalyst/include/OpenSSL/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/macosx_catalyst/include/OpenSSL/core_names.h b/macosx_catalyst/include/OpenSSL/core_names.h
index ffffe90f..a6158056 100644
--- a/macosx_catalyst/include/OpenSSL/core_names.h
+++ b/macosx_catalyst/include/OpenSSL/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/macosx_catalyst/include/OpenSSL/dh.h b/macosx_catalyst/include/OpenSSL/dh.h
index 50617e9e..c20ecb75 100644
--- a/macosx_catalyst/include/OpenSSL/dh.h
+++ b/macosx_catalyst/include/OpenSSL/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/macosx_catalyst/include/OpenSSL/err.h b/macosx_catalyst/include/OpenSSL/err.h
index 42124abc..6b4f4165 100644
--- a/macosx_catalyst/include/OpenSSL/err.h
+++ b/macosx_catalyst/include/OpenSSL/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/macosx_catalyst/include/OpenSSL/evp.h b/macosx_catalyst/include/OpenSSL/evp.h
index c8290eba..1716f700 100644
--- a/macosx_catalyst/include/OpenSSL/evp.h
+++ b/macosx_catalyst/include/OpenSSL/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/macosx_catalyst/include/OpenSSL/hpke.h b/macosx_catalyst/include/OpenSSL/hpke.h
index e7155e4a..adefc552 100644
--- a/macosx_catalyst/include/OpenSSL/hpke.h
+++ b/macosx_catalyst/include/OpenSSL/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/macosx_catalyst/include/OpenSSL/http.h b/macosx_catalyst/include/OpenSSL/http.h
index d33cc797..d3d786f0 100644
--- a/macosx_catalyst/include/OpenSSL/http.h
+++ b/macosx_catalyst/include/OpenSSL/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/macosx_catalyst/include/OpenSSL/httperr.h b/macosx_catalyst/include/OpenSSL/httperr.h
index 70719671..d0aa82fb 100644
--- a/macosx_catalyst/include/OpenSSL/httperr.h
+++ b/macosx_catalyst/include/OpenSSL/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/macosx_catalyst/include/OpenSSL/lhash.h b/macosx_catalyst/include/OpenSSL/lhash.h
index ea77b654..612121fd 100644
--- a/macosx_catalyst/include/OpenSSL/lhash.h
+++ b/macosx_catalyst/include/OpenSSL/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/macosx_catalyst/include/OpenSSL/obj_mac.h b/macosx_catalyst/include/OpenSSL/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/macosx_catalyst/include/OpenSSL/obj_mac.h
+++ b/macosx_catalyst/include/OpenSSL/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/macosx_catalyst/include/OpenSSL/opensslv.h b/macosx_catalyst/include/OpenSSL/opensslv.h
index b3e2dc41..236448d7 100644
--- a/macosx_catalyst/include/OpenSSL/opensslv.h
+++ b/macosx_catalyst/include/OpenSSL/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/macosx_catalyst/include/OpenSSL/pkcs7.h b/macosx_catalyst/include/OpenSSL/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/macosx_catalyst/include/OpenSSL/pkcs7.h
+++ b/macosx_catalyst/include/OpenSSL/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/macosx_catalyst/include/OpenSSL/quic.h b/macosx_catalyst/include/OpenSSL/quic.h
index 10aa86fc..79200a8c 100644
--- a/macosx_catalyst/include/OpenSSL/quic.h
+++ b/macosx_catalyst/include/OpenSSL/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/macosx_catalyst/include/OpenSSL/self_test.h b/macosx_catalyst/include/OpenSSL/self_test.h
index 11ef0da3..46a024d9 100644
--- a/macosx_catalyst/include/OpenSSL/self_test.h
+++ b/macosx_catalyst/include/OpenSSL/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/macosx_catalyst/include/OpenSSL/ssl.h b/macosx_catalyst/include/OpenSSL/ssl.h
index 0dbadf2f..006d063e 100644
--- a/macosx_catalyst/include/OpenSSL/ssl.h
+++ b/macosx_catalyst/include/OpenSSL/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/macosx_catalyst/include/OpenSSL/sslerr.h b/macosx_catalyst/include/OpenSSL/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/macosx_catalyst/include/OpenSSL/sslerr.h
+++ b/macosx_catalyst/include/OpenSSL/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/macosx_catalyst/include/OpenSSL/sslerr_legacy.h b/macosx_catalyst/include/OpenSSL/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/macosx_catalyst/include/OpenSSL/sslerr_legacy.h
+++ b/macosx_catalyst/include/OpenSSL/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/macosx_catalyst/include/OpenSSL/x509_vfy.h b/macosx_catalyst/include/OpenSSL/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/macosx_catalyst/include/OpenSSL/x509_vfy.h
+++ b/macosx_catalyst/include/OpenSSL/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/macosx_catalyst/lib/libcrypto.a b/macosx_catalyst/lib/libcrypto.a
index 0c418a5b..7cbadebe 100644
Binary files a/macosx_catalyst/lib/libcrypto.a and b/macosx_catalyst/lib/libcrypto.a differ
diff --git a/macosx_catalyst/lib/libssl.a b/macosx_catalyst/lib/libssl.a
index be0e6fac..42ac884d 100644
Binary files a/macosx_catalyst/lib/libssl.a and b/macosx_catalyst/lib/libssl.a differ
diff --git a/visionos/include/OpenSSL/asn1err.h b/visionos/include/OpenSSL/asn1err.h
index 4e6d052f..23dab986 100644
--- a/visionos/include/OpenSSL/asn1err.h
+++ b/visionos/include/OpenSSL/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/visionos/include/OpenSSL/bio.h b/visionos/include/OpenSSL/bio.h
index 377fd310..eb91d61c 100644
--- a/visionos/include/OpenSSL/bio.h
+++ b/visionos/include/OpenSSL/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/visionos/include/OpenSSL/cmp.h b/visionos/include/OpenSSL/cmp.h
index 342adaef..829d334d 100644
--- a/visionos/include/OpenSSL/cmp.h
+++ b/visionos/include/OpenSSL/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/visionos/include/OpenSSL/cmperr.h b/visionos/include/OpenSSL/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/visionos/include/OpenSSL/cmperr.h
+++ b/visionos/include/OpenSSL/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/visionos/include/OpenSSL/conf.h b/visionos/include/OpenSSL/conf.h
index 581f435d..d99085b6 100644
--- a/visionos/include/OpenSSL/conf.h
+++ b/visionos/include/OpenSSL/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/visionos/include/OpenSSL/configuration.h b/visionos/include/OpenSSL/configuration.h
index c29c8891..cc8c2a01 100644
--- a/visionos/include/OpenSSL/configuration.h
+++ b/visionos/include/OpenSSL/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_XROS
# define OPENSSL_SYS_XROS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/visionos/include/OpenSSL/core_dispatch.h b/visionos/include/OpenSSL/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/visionos/include/OpenSSL/core_dispatch.h
+++ b/visionos/include/OpenSSL/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/visionos/include/OpenSSL/core_names.h b/visionos/include/OpenSSL/core_names.h
index ffffe90f..a6158056 100644
--- a/visionos/include/OpenSSL/core_names.h
+++ b/visionos/include/OpenSSL/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/visionos/include/OpenSSL/dh.h b/visionos/include/OpenSSL/dh.h
index 50617e9e..c20ecb75 100644
--- a/visionos/include/OpenSSL/dh.h
+++ b/visionos/include/OpenSSL/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/visionos/include/OpenSSL/err.h b/visionos/include/OpenSSL/err.h
index 42124abc..6b4f4165 100644
--- a/visionos/include/OpenSSL/err.h
+++ b/visionos/include/OpenSSL/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/visionos/include/OpenSSL/evp.h b/visionos/include/OpenSSL/evp.h
index c8290eba..1716f700 100644
--- a/visionos/include/OpenSSL/evp.h
+++ b/visionos/include/OpenSSL/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/visionos/include/OpenSSL/hpke.h b/visionos/include/OpenSSL/hpke.h
index e7155e4a..adefc552 100644
--- a/visionos/include/OpenSSL/hpke.h
+++ b/visionos/include/OpenSSL/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/visionos/include/OpenSSL/http.h b/visionos/include/OpenSSL/http.h
index d33cc797..d3d786f0 100644
--- a/visionos/include/OpenSSL/http.h
+++ b/visionos/include/OpenSSL/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/visionos/include/OpenSSL/httperr.h b/visionos/include/OpenSSL/httperr.h
index 70719671..d0aa82fb 100644
--- a/visionos/include/OpenSSL/httperr.h
+++ b/visionos/include/OpenSSL/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/visionos/include/OpenSSL/lhash.h b/visionos/include/OpenSSL/lhash.h
index ea77b654..612121fd 100644
--- a/visionos/include/OpenSSL/lhash.h
+++ b/visionos/include/OpenSSL/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/visionos/include/OpenSSL/obj_mac.h b/visionos/include/OpenSSL/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/visionos/include/OpenSSL/obj_mac.h
+++ b/visionos/include/OpenSSL/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/visionos/include/OpenSSL/opensslv.h b/visionos/include/OpenSSL/opensslv.h
index b3e2dc41..236448d7 100644
--- a/visionos/include/OpenSSL/opensslv.h
+++ b/visionos/include/OpenSSL/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/visionos/include/OpenSSL/pkcs7.h b/visionos/include/OpenSSL/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/visionos/include/OpenSSL/pkcs7.h
+++ b/visionos/include/OpenSSL/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/visionos/include/OpenSSL/quic.h b/visionos/include/OpenSSL/quic.h
index 10aa86fc..79200a8c 100644
--- a/visionos/include/OpenSSL/quic.h
+++ b/visionos/include/OpenSSL/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/visionos/include/OpenSSL/self_test.h b/visionos/include/OpenSSL/self_test.h
index 11ef0da3..46a024d9 100644
--- a/visionos/include/OpenSSL/self_test.h
+++ b/visionos/include/OpenSSL/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/visionos/include/OpenSSL/ssl.h b/visionos/include/OpenSSL/ssl.h
index 0dbadf2f..006d063e 100644
--- a/visionos/include/OpenSSL/ssl.h
+++ b/visionos/include/OpenSSL/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/visionos/include/OpenSSL/sslerr.h b/visionos/include/OpenSSL/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/visionos/include/OpenSSL/sslerr.h
+++ b/visionos/include/OpenSSL/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/visionos/include/OpenSSL/sslerr_legacy.h b/visionos/include/OpenSSL/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/visionos/include/OpenSSL/sslerr_legacy.h
+++ b/visionos/include/OpenSSL/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/visionos/include/OpenSSL/x509_vfy.h b/visionos/include/OpenSSL/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/visionos/include/OpenSSL/x509_vfy.h
+++ b/visionos/include/OpenSSL/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/visionos/lib/libcrypto.a b/visionos/lib/libcrypto.a
index 3079aee1..b19b8787 100644
Binary files a/visionos/lib/libcrypto.a and b/visionos/lib/libcrypto.a differ
diff --git a/visionos/lib/libssl.a b/visionos/lib/libssl.a
index 4287d754..4ba7fc16 100644
Binary files a/visionos/lib/libssl.a and b/visionos/lib/libssl.a differ
diff --git a/visionsimulator/include/OpenSSL/asn1err.h b/visionsimulator/include/OpenSSL/asn1err.h
index 4e6d052f..23dab986 100644
--- a/visionsimulator/include/OpenSSL/asn1err.h
+++ b/visionsimulator/include/OpenSSL/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/visionsimulator/include/OpenSSL/bio.h b/visionsimulator/include/OpenSSL/bio.h
index 377fd310..eb91d61c 100644
--- a/visionsimulator/include/OpenSSL/bio.h
+++ b/visionsimulator/include/OpenSSL/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/visionsimulator/include/OpenSSL/cmp.h b/visionsimulator/include/OpenSSL/cmp.h
index 342adaef..829d334d 100644
--- a/visionsimulator/include/OpenSSL/cmp.h
+++ b/visionsimulator/include/OpenSSL/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/visionsimulator/include/OpenSSL/cmperr.h b/visionsimulator/include/OpenSSL/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/visionsimulator/include/OpenSSL/cmperr.h
+++ b/visionsimulator/include/OpenSSL/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/visionsimulator/include/OpenSSL/conf.h b/visionsimulator/include/OpenSSL/conf.h
index 581f435d..d99085b6 100644
--- a/visionsimulator/include/OpenSSL/conf.h
+++ b/visionsimulator/include/OpenSSL/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/visionsimulator/include/OpenSSL/configuration.h b/visionsimulator/include/OpenSSL/configuration.h
index c29c8891..cc8c2a01 100644
--- a/visionsimulator/include/OpenSSL/configuration.h
+++ b/visionsimulator/include/OpenSSL/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_XROS
# define OPENSSL_SYS_XROS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/visionsimulator/include/OpenSSL/core_dispatch.h b/visionsimulator/include/OpenSSL/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/visionsimulator/include/OpenSSL/core_dispatch.h
+++ b/visionsimulator/include/OpenSSL/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/visionsimulator/include/OpenSSL/core_names.h b/visionsimulator/include/OpenSSL/core_names.h
index ffffe90f..a6158056 100644
--- a/visionsimulator/include/OpenSSL/core_names.h
+++ b/visionsimulator/include/OpenSSL/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/visionsimulator/include/OpenSSL/dh.h b/visionsimulator/include/OpenSSL/dh.h
index 50617e9e..c20ecb75 100644
--- a/visionsimulator/include/OpenSSL/dh.h
+++ b/visionsimulator/include/OpenSSL/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/visionsimulator/include/OpenSSL/err.h b/visionsimulator/include/OpenSSL/err.h
index 42124abc..6b4f4165 100644
--- a/visionsimulator/include/OpenSSL/err.h
+++ b/visionsimulator/include/OpenSSL/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/visionsimulator/include/OpenSSL/evp.h b/visionsimulator/include/OpenSSL/evp.h
index c8290eba..1716f700 100644
--- a/visionsimulator/include/OpenSSL/evp.h
+++ b/visionsimulator/include/OpenSSL/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/visionsimulator/include/OpenSSL/hpke.h b/visionsimulator/include/OpenSSL/hpke.h
index e7155e4a..adefc552 100644
--- a/visionsimulator/include/OpenSSL/hpke.h
+++ b/visionsimulator/include/OpenSSL/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/visionsimulator/include/OpenSSL/http.h b/visionsimulator/include/OpenSSL/http.h
index d33cc797..d3d786f0 100644
--- a/visionsimulator/include/OpenSSL/http.h
+++ b/visionsimulator/include/OpenSSL/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/visionsimulator/include/OpenSSL/httperr.h b/visionsimulator/include/OpenSSL/httperr.h
index 70719671..d0aa82fb 100644
--- a/visionsimulator/include/OpenSSL/httperr.h
+++ b/visionsimulator/include/OpenSSL/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/visionsimulator/include/OpenSSL/lhash.h b/visionsimulator/include/OpenSSL/lhash.h
index ea77b654..612121fd 100644
--- a/visionsimulator/include/OpenSSL/lhash.h
+++ b/visionsimulator/include/OpenSSL/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/visionsimulator/include/OpenSSL/obj_mac.h b/visionsimulator/include/OpenSSL/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/visionsimulator/include/OpenSSL/obj_mac.h
+++ b/visionsimulator/include/OpenSSL/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/visionsimulator/include/OpenSSL/opensslv.h b/visionsimulator/include/OpenSSL/opensslv.h
index b3e2dc41..236448d7 100644
--- a/visionsimulator/include/OpenSSL/opensslv.h
+++ b/visionsimulator/include/OpenSSL/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/visionsimulator/include/OpenSSL/pkcs7.h b/visionsimulator/include/OpenSSL/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/visionsimulator/include/OpenSSL/pkcs7.h
+++ b/visionsimulator/include/OpenSSL/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/visionsimulator/include/OpenSSL/quic.h b/visionsimulator/include/OpenSSL/quic.h
index 10aa86fc..79200a8c 100644
--- a/visionsimulator/include/OpenSSL/quic.h
+++ b/visionsimulator/include/OpenSSL/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/visionsimulator/include/OpenSSL/self_test.h b/visionsimulator/include/OpenSSL/self_test.h
index 11ef0da3..46a024d9 100644
--- a/visionsimulator/include/OpenSSL/self_test.h
+++ b/visionsimulator/include/OpenSSL/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/visionsimulator/include/OpenSSL/ssl.h b/visionsimulator/include/OpenSSL/ssl.h
index 0dbadf2f..006d063e 100644
--- a/visionsimulator/include/OpenSSL/ssl.h
+++ b/visionsimulator/include/OpenSSL/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/visionsimulator/include/OpenSSL/sslerr.h b/visionsimulator/include/OpenSSL/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/visionsimulator/include/OpenSSL/sslerr.h
+++ b/visionsimulator/include/OpenSSL/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/visionsimulator/include/OpenSSL/sslerr_legacy.h b/visionsimulator/include/OpenSSL/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/visionsimulator/include/OpenSSL/sslerr_legacy.h
+++ b/visionsimulator/include/OpenSSL/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/visionsimulator/include/OpenSSL/x509_vfy.h b/visionsimulator/include/OpenSSL/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/visionsimulator/include/OpenSSL/x509_vfy.h
+++ b/visionsimulator/include/OpenSSL/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/visionsimulator/lib/libcrypto.a b/visionsimulator/lib/libcrypto.a
index 9763b6e0..9f19b7ab 100644
Binary files a/visionsimulator/lib/libcrypto.a and b/visionsimulator/lib/libcrypto.a differ
diff --git a/visionsimulator/lib/libssl.a b/visionsimulator/lib/libssl.a
index 98882f2e..3eb79a0a 100644
Binary files a/visionsimulator/lib/libssl.a and b/visionsimulator/lib/libssl.a differ
diff --git a/watchos/include/OpenSSL/asn1err.h b/watchos/include/OpenSSL/asn1err.h
index 4e6d052f..23dab986 100644
--- a/watchos/include/OpenSSL/asn1err.h
+++ b/watchos/include/OpenSSL/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/watchos/include/OpenSSL/bio.h b/watchos/include/OpenSSL/bio.h
index 377fd310..eb91d61c 100644
--- a/watchos/include/OpenSSL/bio.h
+++ b/watchos/include/OpenSSL/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/watchos/include/OpenSSL/cmp.h b/watchos/include/OpenSSL/cmp.h
index 342adaef..829d334d 100644
--- a/watchos/include/OpenSSL/cmp.h
+++ b/watchos/include/OpenSSL/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/watchos/include/OpenSSL/cmperr.h b/watchos/include/OpenSSL/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/watchos/include/OpenSSL/cmperr.h
+++ b/watchos/include/OpenSSL/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/watchos/include/OpenSSL/conf.h b/watchos/include/OpenSSL/conf.h
index 581f435d..d99085b6 100644
--- a/watchos/include/OpenSSL/conf.h
+++ b/watchos/include/OpenSSL/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/watchos/include/OpenSSL/configuration.h b/watchos/include/OpenSSL/configuration.h
index 2e2e7246..ccd77db9 100644
--- a/watchos/include/OpenSSL/configuration.h
+++ b/watchos/include/OpenSSL/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_watchOS
# define OPENSSL_SYS_watchOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/watchos/include/OpenSSL/core_dispatch.h b/watchos/include/OpenSSL/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/watchos/include/OpenSSL/core_dispatch.h
+++ b/watchos/include/OpenSSL/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/watchos/include/OpenSSL/core_names.h b/watchos/include/OpenSSL/core_names.h
index ffffe90f..a6158056 100644
--- a/watchos/include/OpenSSL/core_names.h
+++ b/watchos/include/OpenSSL/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/watchos/include/OpenSSL/dh.h b/watchos/include/OpenSSL/dh.h
index 50617e9e..c20ecb75 100644
--- a/watchos/include/OpenSSL/dh.h
+++ b/watchos/include/OpenSSL/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/watchos/include/OpenSSL/err.h b/watchos/include/OpenSSL/err.h
index 42124abc..6b4f4165 100644
--- a/watchos/include/OpenSSL/err.h
+++ b/watchos/include/OpenSSL/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/watchos/include/OpenSSL/evp.h b/watchos/include/OpenSSL/evp.h
index c8290eba..1716f700 100644
--- a/watchos/include/OpenSSL/evp.h
+++ b/watchos/include/OpenSSL/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/watchos/include/OpenSSL/hpke.h b/watchos/include/OpenSSL/hpke.h
index e7155e4a..adefc552 100644
--- a/watchos/include/OpenSSL/hpke.h
+++ b/watchos/include/OpenSSL/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/watchos/include/OpenSSL/http.h b/watchos/include/OpenSSL/http.h
index d33cc797..d3d786f0 100644
--- a/watchos/include/OpenSSL/http.h
+++ b/watchos/include/OpenSSL/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/watchos/include/OpenSSL/httperr.h b/watchos/include/OpenSSL/httperr.h
index 70719671..d0aa82fb 100644
--- a/watchos/include/OpenSSL/httperr.h
+++ b/watchos/include/OpenSSL/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/watchos/include/OpenSSL/lhash.h b/watchos/include/OpenSSL/lhash.h
index ea77b654..612121fd 100644
--- a/watchos/include/OpenSSL/lhash.h
+++ b/watchos/include/OpenSSL/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/watchos/include/OpenSSL/obj_mac.h b/watchos/include/OpenSSL/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/watchos/include/OpenSSL/obj_mac.h
+++ b/watchos/include/OpenSSL/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/watchos/include/OpenSSL/opensslv.h b/watchos/include/OpenSSL/opensslv.h
index b3e2dc41..236448d7 100644
--- a/watchos/include/OpenSSL/opensslv.h
+++ b/watchos/include/OpenSSL/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/watchos/include/OpenSSL/pkcs7.h b/watchos/include/OpenSSL/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/watchos/include/OpenSSL/pkcs7.h
+++ b/watchos/include/OpenSSL/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/watchos/include/OpenSSL/quic.h b/watchos/include/OpenSSL/quic.h
index 10aa86fc..79200a8c 100644
--- a/watchos/include/OpenSSL/quic.h
+++ b/watchos/include/OpenSSL/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/watchos/include/OpenSSL/self_test.h b/watchos/include/OpenSSL/self_test.h
index 11ef0da3..46a024d9 100644
--- a/watchos/include/OpenSSL/self_test.h
+++ b/watchos/include/OpenSSL/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/watchos/include/OpenSSL/ssl.h b/watchos/include/OpenSSL/ssl.h
index 0dbadf2f..006d063e 100644
--- a/watchos/include/OpenSSL/ssl.h
+++ b/watchos/include/OpenSSL/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/watchos/include/OpenSSL/sslerr.h b/watchos/include/OpenSSL/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/watchos/include/OpenSSL/sslerr.h
+++ b/watchos/include/OpenSSL/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/watchos/include/OpenSSL/sslerr_legacy.h b/watchos/include/OpenSSL/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/watchos/include/OpenSSL/sslerr_legacy.h
+++ b/watchos/include/OpenSSL/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/watchos/include/OpenSSL/x509_vfy.h b/watchos/include/OpenSSL/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/watchos/include/OpenSSL/x509_vfy.h
+++ b/watchos/include/OpenSSL/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/watchos/lib/libcrypto.a b/watchos/lib/libcrypto.a
index a6313840..2271cfa5 100644
Binary files a/watchos/lib/libcrypto.a and b/watchos/lib/libcrypto.a differ
diff --git a/watchos/lib/libssl.a b/watchos/lib/libssl.a
index f176a47f..fa69a2ff 100644
Binary files a/watchos/lib/libssl.a and b/watchos/lib/libssl.a differ
diff --git a/watchsimulator/include/OpenSSL/asn1err.h b/watchsimulator/include/OpenSSL/asn1err.h
index 4e6d052f..23dab986 100644
--- a/watchsimulator/include/OpenSSL/asn1err.h
+++ b/watchsimulator/include/OpenSSL/asn1err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -47,6 +47,7 @@
# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
# define ASN1_R_FIELD_MISSING 121
# define ASN1_R_FIRST_NUM_TOO_LARGE 122
+# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
# define ASN1_R_HEADER_TOO_LONG 123
# define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
# define ASN1_R_ILLEGAL_BOOLEAN 176
@@ -133,6 +134,7 @@
# define ASN1_R_UNSUPPORTED_CIPHER 228
# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
# define ASN1_R_UNSUPPORTED_TYPE 196
+# define ASN1_R_UTCTIME_IS_TOO_SHORT 233
# define ASN1_R_WRONG_INTEGER_TYPE 225
# define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
# define ASN1_R_WRONG_TAG 168
diff --git a/watchsimulator/include/OpenSSL/bio.h b/watchsimulator/include/OpenSSL/bio.h
index 377fd310..eb91d61c 100644
--- a/watchsimulator/include/OpenSSL/bio.h
+++ b/watchsimulator/include/OpenSSL/bio.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/bio.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -70,7 +70,10 @@ extern "C" {
# define BIO_TYPE_DGRAM_PAIR (26|BIO_TYPE_SOURCE_SINK)
# define BIO_TYPE_DGRAM_MEM (27|BIO_TYPE_SOURCE_SINK)
+/* Custom type starting index returned by BIO_get_new_index() */
#define BIO_TYPE_START 128
+/* Custom type maximum index that can be returned by BIO_get_new_index() */
+#define BIO_TYPE_MASK 0xFF
/*
* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
@@ -407,6 +410,7 @@ typedef struct bio_mmsg_cb_args_st {
#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
typedef struct bio_poll_descriptor_st {
@@ -415,6 +419,7 @@ typedef struct bio_poll_descriptor_st {
int fd;
void *custom;
uintptr_t custom_ui;
+ SSL *ssl;
} value;
} BIO_POLL_DESCRIPTOR;
diff --git a/watchsimulator/include/OpenSSL/cmp.h b/watchsimulator/include/OpenSSL/cmp.h
index 342adaef..829d334d 100644
--- a/watchsimulator/include/OpenSSL/cmp.h
+++ b/watchsimulator/include/OpenSSL/cmp.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/cmp.h.in
*
- * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
@@ -380,6 +380,10 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
OSSL_CMP_ITAV *itav);
void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
+OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
+ *certProfile);
+int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
+ STACK_OF(ASN1_UTF8STRING) **out);
OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
@@ -425,6 +429,7 @@ const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
# define OSSL_CMP_OPT_DIGEST_ALGNID 34
# define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
# define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+# define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
/* CMP-specific callback for logging and outputting the error queue: */
@@ -470,6 +475,8 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
STACK_OF(X509) *extraCertsOut);
/* certificate template: */
@@ -522,10 +529,13 @@ OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
OSSL_CMP_PKIHEADER *hdr);
ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
+STACK_OF(OSSL_CMP_ITAV)
+ *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
/* from cmp_msg.c */
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
+X509_PUBKEY *OSSL_CMP_MSG_get0_certreq_publickey(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
@@ -587,6 +597,13 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
OSSL_CMP_SRV_error_cb_t process_error,
OSSL_CMP_SRV_certConf_cb_t process_certConf,
OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const OSSL_CMP_MSG *req);
+typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
+ const ASN1_OCTET_STRING *id);
+int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
+ OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+ OSSL_CMP_SRV_clean_transaction_cb_t clean);
OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
@@ -603,6 +620,8 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
# define OSSL_CMP_CR 2
# define OSSL_CMP_P10CR 4
# define OSSL_CMP_KUR 7
+# define OSSL_CMP_GENM 21
+# define OSSL_CMP_ERROR 23
# define OSSL_CMP_exec_IR_ses(ctx) \
OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
# define OSSL_CMP_exec_CR_ses(ctx) \
diff --git a/watchsimulator/include/OpenSSL/cmperr.h b/watchsimulator/include/OpenSSL/cmperr.h
index 71fd6353..4ba527d2 100644
--- a/watchsimulator/include/OpenSSL/cmperr.h
+++ b/watchsimulator/include/OpenSSL/cmperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -55,6 +55,7 @@
# define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
# define CMP_R_ERROR_VALIDATING_PROTECTION 140
# define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+# define CMP_R_EXPECTED_POLLREQ 104
# define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
# define CMP_R_FAILED_EXTRACTING_PUBKEY 141
# define CMP_R_FAILURE_OBTAINING_RANDOM 110
@@ -98,14 +99,18 @@
# define CMP_R_TRANSACTIONID_UNMATCHED 152
# define CMP_R_TRANSFER_ERROR 159
# define CMP_R_UNCLEAN_CTX 191
+# define CMP_R_UNEXPECTED_CERTPROFILE 196
# define CMP_R_UNEXPECTED_PKIBODY 133
# define CMP_R_UNEXPECTED_PKISTATUS 185
+# define CMP_R_UNEXPECTED_POLLREQ 105
# define CMP_R_UNEXPECTED_PVNO 153
+# define CMP_R_UNEXPECTED_SENDER 106
# define CMP_R_UNKNOWN_ALGORITHM_ID 134
# define CMP_R_UNKNOWN_CERT_TYPE 135
# define CMP_R_UNKNOWN_PKISTATUS 186
# define CMP_R_UNSUPPORTED_ALGORITHM 136
# define CMP_R_UNSUPPORTED_KEY_TYPE 137
+# define CMP_R_UNSUPPORTED_PKIBODY 101
# define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
# define CMP_R_VALUE_TOO_LARGE 175
# define CMP_R_VALUE_TOO_SMALL 177
diff --git a/watchsimulator/include/OpenSSL/conf.h b/watchsimulator/include/OpenSSL/conf.h
index 581f435d..d99085b6 100644
--- a/watchsimulator/include/OpenSSL/conf.h
+++ b/watchsimulator/include/OpenSSL/conf.h
@@ -68,7 +68,7 @@ SKM_DEFINE_STACK_OF_INTERNAL(CONF_VALUE, CONF_VALUE, CONF_VALUE)
#define sk_CONF_VALUE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(CONF_VALUE) *)OPENSSL_sk_deep_copy(ossl_check_const_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_copyfunc_type(copyfunc), ossl_check_CONF_VALUE_freefunc_type(freefunc)))
#define sk_CONF_VALUE_set_cmp_func(sk, cmp) ((sk_CONF_VALUE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_CONF_VALUE_sk_type(sk), ossl_check_CONF_VALUE_compfunc_type(cmp)))
DEFINE_LHASH_OF_INTERNAL(CONF_VALUE);
-#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)))
+#define lh_CONF_VALUE_new(hfn, cmp) ((LHASH_OF(CONF_VALUE) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_CONF_VALUE_lh_hashfunc_type(hfn), ossl_check_CONF_VALUE_lh_compfunc_type(cmp)), lh_CONF_VALUE_hash_thunk, lh_CONF_VALUE_comp_thunk, lh_CONF_VALUE_doall_thunk, lh_CONF_VALUE_doall_arg_thunk))
#define lh_CONF_VALUE_free(lh) OPENSSL_LH_free(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_flush(lh) OPENSSL_LH_flush(ossl_check_CONF_VALUE_lh_type(lh))
#define lh_CONF_VALUE_insert(lh, ptr) ((CONF_VALUE *)OPENSSL_LH_insert(ossl_check_CONF_VALUE_lh_type(lh), ossl_check_CONF_VALUE_lh_plain_type(ptr)))
diff --git a/watchsimulator/include/OpenSSL/configuration.h b/watchsimulator/include/OpenSSL/configuration.h
index 2e2e7246..ccd77db9 100644
--- a/watchsimulator/include/OpenSSL/configuration.h
+++ b/watchsimulator/include/OpenSSL/configuration.h
@@ -30,7 +30,7 @@ extern "C" {
# ifndef OPENSSL_SYS_watchOS
# define OPENSSL_SYS_watchOS 1
# endif
-# define OPENSSL_CONFIGURED_API 30200
+# define OPENSSL_CONFIGURED_API 30300
# ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
# endif
diff --git a/watchsimulator/include/OpenSSL/core_dispatch.h b/watchsimulator/include/OpenSSL/core_dispatch.h
index b146f1f1..274a7fcb 100644
--- a/watchsimulator/include/OpenSSL/core_dispatch.h
+++ b/watchsimulator/include/OpenSSL/core_dispatch.h
@@ -300,6 +300,7 @@ OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+# define OSSL_FUNC_DIGEST_SQUEEZE 14
OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
@@ -308,6 +309,9 @@ OSSL_CORE_MAKE_FUNC(int, digest_update,
OSSL_CORE_MAKE_FUNC(int, digest_final,
(void *dctx,
unsigned char *out, size_t *outl, size_t outsz))
+OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
+ (void *dctx,
+ unsigned char *out, size_t *outl, size_t outsz))
OSSL_CORE_MAKE_FUNC(int, digest_digest,
(void *provctx, const unsigned char *in, size_t inl,
unsigned char *out, size_t *outl, size_t outsz))
diff --git a/watchsimulator/include/OpenSSL/core_names.h b/watchsimulator/include/OpenSSL/core_names.h
index ffffe90f..a6158056 100644
--- a/watchsimulator/include/OpenSSL/core_names.h
+++ b/watchsimulator/include/OpenSSL/core_names.h
@@ -384,6 +384,7 @@ extern "C" {
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT8 "rsa-coefficient8"
# define OSSL_PKEY_PARAM_RSA_COEFFICIENT9 "rsa-coefficient9"
# define OSSL_PKEY_PARAM_RSA_D "d"
+# define OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ "rsa-derive-from-pq"
# define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST
# define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES
# define OSSL_PKEY_PARAM_RSA_E "e"
diff --git a/watchsimulator/include/OpenSSL/dh.h b/watchsimulator/include/OpenSSL/dh.h
index 50617e9e..c20ecb75 100644
--- a/watchsimulator/include/OpenSSL/dh.h
+++ b/watchsimulator/include/OpenSSL/dh.h
@@ -25,7 +25,11 @@ extern "C" {
#include
-/* DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type() */
+/*
+ * DH parameter generation types used by EVP_PKEY_CTX_set_dh_paramgen_type()
+ * Note that additions/changes to this set of values requires corresponding
+ * adjustments to range checks in dh_gen()
+ */
# define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
# define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
# define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
diff --git a/watchsimulator/include/OpenSSL/err.h b/watchsimulator/include/OpenSSL/err.h
index 42124abc..6b4f4165 100644
--- a/watchsimulator/include/OpenSSL/err.h
+++ b/watchsimulator/include/OpenSSL/err.h
@@ -372,7 +372,7 @@ typedef struct ERR_string_data_st {
} ERR_STRING_DATA;
DEFINE_LHASH_OF_INTERNAL(ERR_STRING_DATA);
-#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)))
+#define lh_ERR_STRING_DATA_new(hfn, cmp) ((LHASH_OF(ERR_STRING_DATA) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_ERR_STRING_DATA_lh_hashfunc_type(hfn), ossl_check_ERR_STRING_DATA_lh_compfunc_type(cmp)), lh_ERR_STRING_DATA_hash_thunk, lh_ERR_STRING_DATA_comp_thunk, lh_ERR_STRING_DATA_doall_thunk, lh_ERR_STRING_DATA_doall_arg_thunk))
#define lh_ERR_STRING_DATA_free(lh) OPENSSL_LH_free(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_flush(lh) OPENSSL_LH_flush(ossl_check_ERR_STRING_DATA_lh_type(lh))
#define lh_ERR_STRING_DATA_insert(lh, ptr) ((ERR_STRING_DATA *)OPENSSL_LH_insert(ossl_check_ERR_STRING_DATA_lh_type(lh), ossl_check_ERR_STRING_DATA_lh_plain_type(ptr)))
@@ -497,6 +497,7 @@ int ERR_set_mark(void);
int ERR_pop_to_mark(void);
int ERR_clear_last_mark(void);
int ERR_count_to_mark(void);
+int ERR_pop(void);
ERR_STATE *OSSL_ERR_STATE_new(void);
void OSSL_ERR_STATE_save(ERR_STATE *es);
diff --git a/watchsimulator/include/OpenSSL/evp.h b/watchsimulator/include/OpenSSL/evp.h
index c8290eba..1716f700 100644
--- a/watchsimulator/include/OpenSSL/evp.h
+++ b/watchsimulator/include/OpenSSL/evp.h
@@ -729,8 +729,10 @@ __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
__owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
__owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
unsigned int *s);
-__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md,
- size_t len);
+__owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
+__owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
+ size_t outlen);
__owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
const char *properties);
diff --git a/watchsimulator/include/OpenSSL/hpke.h b/watchsimulator/include/OpenSSL/hpke.h
index e7155e4a..adefc552 100644
--- a/watchsimulator/include/OpenSSL/hpke.h
+++ b/watchsimulator/include/OpenSSL/hpke.h
@@ -68,7 +68,7 @@
/*
* Roles for use in creating an OSSL_HPKE_CTX, most
- * important use of this is to control nonce re-use.
+ * important use of this is to control nonce reuse.
*/
# define OSSL_HPKE_ROLE_SENDER 0
# define OSSL_HPKE_ROLE_RECEIVER 1
diff --git a/watchsimulator/include/OpenSSL/http.h b/watchsimulator/include/OpenSSL/http.h
index d33cc797..d3d786f0 100644
--- a/watchsimulator/include/OpenSSL/http.h
+++ b/watchsimulator/include/OpenSSL/http.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Siemens AG 2018-2020
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -37,6 +37,8 @@ extern "C" {
#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+
/* Low-level HTTP API */
OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
@@ -105,6 +107,8 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
const char *server, int use_ssl);
+void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
+ size_t count);
# endif /* !defined(OPENSSL_NO_HTTP) */
# ifdef __cplusplus
diff --git a/watchsimulator/include/OpenSSL/httperr.h b/watchsimulator/include/OpenSSL/httperr.h
index 70719671..d0aa82fb 100644
--- a/watchsimulator/include/OpenSSL/httperr.h
+++ b/watchsimulator/include/OpenSSL/httperr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,6 +44,7 @@
# define HTTP_R_REDIRECTION_NOT_ENABLED 116
# define HTTP_R_RESPONSE_LINE_TOO_LONG 113
# define HTTP_R_RESPONSE_PARSE_ERROR 104
+# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
# define HTTP_R_RETRY_TIMEOUT 129
# define HTTP_R_SERVER_CANCELED_CONNECTION 127
# define HTTP_R_SOCK_NOT_SUPPORTED 122
diff --git a/watchsimulator/include/OpenSSL/lhash.h b/watchsimulator/include/OpenSSL/lhash.h
index ea77b654..612121fd 100644
--- a/watchsimulator/include/OpenSSL/lhash.h
+++ b/watchsimulator/include/OpenSSL/lhash.h
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -34,9 +34,13 @@ extern "C" {
typedef struct lhash_node_st OPENSSL_LH_NODE;
typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
typedef struct lhash_st OPENSSL_LHASH;
/*
@@ -82,13 +86,23 @@ typedef struct lhash_st OPENSSL_LHASH;
int OPENSSL_LH_error(OPENSSL_LHASH *lh);
OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
+OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
+ OPENSSL_LH_HASHFUNCTHUNK hw,
+ OPENSSL_LH_COMPFUNCTHUNK cw,
+ OPENSSL_LH_DOALL_FUNC_THUNK daw,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
void OPENSSL_LH_free(OPENSSL_LHASH *lh);
void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
-void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
+ OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+ OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+
unsigned long OPENSSL_LH_strhash(const char *c);
unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
@@ -142,6 +156,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
typedef void (*lh_##type##_doallfunc)(type *a); \
+ static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
+ { \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
+ } \
+ static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
static ossl_unused ossl_inline type *\
ossl_check_##type##_lh_plain_type(type *ptr) \
{ \
@@ -204,12 +238,16 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
LHASH_OF(type) { \
union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
}; \
- static ossl_unused ossl_inline LHASH_OF(type) * \
- lh_##type##_new(unsigned long (*hfn)(const type *), \
- int (*cfn)(const type *, const type *)) \
+ static unsigned long \
+ lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
{ \
- return (LHASH_OF(type) *) \
- OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \
+ unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
+ return hfn_conv((const type *)data); \
+ } \
+ static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
+ { \
+ int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
+ return cfn_conv((const type *)da, (const type *)db); \
} \
static ossl_unused ossl_inline void \
lh_##type##_free(LHASH_OF(type) *lh) \
@@ -257,10 +295,31 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
} \
static ossl_unused ossl_inline void \
+ lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
+ { \
+ void (*doall_conv)(type *) = (void (*)(type *))doall; \
+ doall_conv((type *)node); \
+ } \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
+ { \
+ void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
+ doall_conv((type *)node, arg); \
+ } \
+ static ossl_unused ossl_inline void \
lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
{ \
OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
} \
+ static ossl_unused ossl_inline LHASH_OF(type) * \
+ lh_##type##_new(unsigned long (*hfn)(const type *), \
+ int (*cfn)(const type *, const type *)) \
+ { \
+ return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
+ lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
+ lh_##type##_doall_thunk, \
+ lh_##type##_doall_arg_thunk); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_arg(LHASH_OF(type) *lh, \
void (*doallarg)(type *, void *), void *arg) \
@@ -282,18 +341,26 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
int_implement_lhash_doall(type, argtype, type)
#define int_implement_lhash_doall(type, argtype, cbargtype) \
+ static ossl_unused ossl_inline void \
+ lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
+ { \
+ void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
+ fn_conv((cbargtype *)node, (argtype *)arg); \
+ } \
static ossl_unused ossl_inline void \
lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
void (*fn)(cbargtype *, argtype *), \
argtype *arg) \
{ \
- OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
- (OPENSSL_LH_DOALL_FUNCARG)fn, (void *)arg); \
+ OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
+ lh_##type##_doall_##argtype##_thunk, \
+ (OPENSSL_LH_DOALL_FUNCARG)fn, \
+ (void *)arg); \
} \
LHASH_OF(type)
DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
-#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_STRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_STRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_STRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_STRING_lh_compfunc_type(cmp)), lh_OPENSSL_STRING_hash_thunk, lh_OPENSSL_STRING_comp_thunk, lh_OPENSSL_STRING_doall_thunk, lh_OPENSSL_STRING_doall_arg_thunk))
#define lh_OPENSSL_STRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_STRING_lh_type(lh))
#define lh_OPENSSL_STRING_insert(lh, ptr) ((OPENSSL_STRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_plain_type(ptr)))
@@ -308,7 +375,7 @@ DEFINE_LHASH_OF_INTERNAL(OPENSSL_STRING);
#define lh_OPENSSL_STRING_set_down_load(lh, dl) OPENSSL_LH_set_down_load(ossl_check_OPENSSL_STRING_lh_type(lh), dl)
#define lh_OPENSSL_STRING_doall(lh, dfn) OPENSSL_LH_doall(ossl_check_OPENSSL_STRING_lh_type(lh), ossl_check_OPENSSL_STRING_lh_doallfunc_type(dfn))
DEFINE_LHASH_OF_INTERNAL(OPENSSL_CSTRING);
-#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)))
+#define lh_OPENSSL_CSTRING_new(hfn, cmp) ((LHASH_OF(OPENSSL_CSTRING) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new(ossl_check_OPENSSL_CSTRING_lh_hashfunc_type(hfn), ossl_check_OPENSSL_CSTRING_lh_compfunc_type(cmp)), lh_OPENSSL_CSTRING_hash_thunk, lh_OPENSSL_CSTRING_comp_thunk, lh_OPENSSL_CSTRING_doall_thunk, lh_OPENSSL_CSTRING_doall_arg_thunk))
#define lh_OPENSSL_CSTRING_free(lh) OPENSSL_LH_free(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_flush(lh) OPENSSL_LH_flush(ossl_check_OPENSSL_CSTRING_lh_type(lh))
#define lh_OPENSSL_CSTRING_insert(lh, ptr) ((OPENSSL_CSTRING *)OPENSSL_LH_insert(ossl_check_OPENSSL_CSTRING_lh_type(lh), ossl_check_OPENSSL_CSTRING_lh_plain_type(ptr)))
diff --git a/watchsimulator/include/OpenSSL/obj_mac.h b/watchsimulator/include/OpenSSL/obj_mac.h
index e1b441b3..1b7d9240 100644
--- a/watchsimulator/include/OpenSSL/obj_mac.h
+++ b/watchsimulator/include/OpenSSL/obj_mac.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by crypto/objects/objects.pl
*
- * Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
@@ -894,6 +894,10 @@
#define NID_id_ct_signedTAL 1284
#define OBJ_id_ct_signedTAL OBJ_id_smime_ct,50L
+#define SN_id_ct_rpkiSignedPrefixList "id-ct-rpkiSignedPrefixList"
+#define NID_id_ct_rpkiSignedPrefixList 1320
+#define OBJ_id_ct_rpkiSignedPrefixList OBJ_id_smime_ct,51L
+
#define SN_id_smime_aa_receiptRequest "id-smime-aa-receiptRequest"
#define NID_id_smime_aa_receiptRequest 212
#define OBJ_id_smime_aa_receiptRequest OBJ_id_smime_aa,1L
diff --git a/watchsimulator/include/OpenSSL/opensslv.h b/watchsimulator/include/OpenSSL/opensslv.h
index b3e2dc41..236448d7 100644
--- a/watchsimulator/include/OpenSSL/opensslv.h
+++ b/watchsimulator/include/OpenSSL/opensslv.h
@@ -28,8 +28,8 @@ extern "C" {
* These macros express version number MAJOR.MINOR.PATCH exactly
*/
# define OPENSSL_VERSION_MAJOR 3
-# define OPENSSL_VERSION_MINOR 2
-# define OPENSSL_VERSION_PATCH 2
+# define OPENSSL_VERSION_MINOR 3
+# define OPENSSL_VERSION_PATCH 1
/*
* Additional version information
@@ -74,8 +74,8 @@ extern "C" {
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
*/
-# define OPENSSL_VERSION_STR "3.2.2"
-# define OPENSSL_FULL_VERSION_STR "3.2.2"
+# define OPENSSL_VERSION_STR "3.3.1"
+# define OPENSSL_FULL_VERSION_STR "3.3.1"
/*
* SECTION 3: ADDITIONAL METADATA
@@ -88,7 +88,7 @@ extern "C" {
* SECTION 4: BACKWARD COMPATIBILITY
*/
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.2 4 Jun 2024"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.3.1 4 Jun 2024"
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
# ifdef OPENSSL_VERSION_PRE_RELEASE
diff --git a/watchsimulator/include/OpenSSL/pkcs7.h b/watchsimulator/include/OpenSSL/pkcs7.h
index 86d7d66a..f75bddbe 100644
--- a/watchsimulator/include/OpenSSL/pkcs7.h
+++ b/watchsimulator/include/OpenSSL/pkcs7.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/pkcs7.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/watchsimulator/include/OpenSSL/quic.h b/watchsimulator/include/OpenSSL/quic.h
index 10aa86fc..79200a8c 100644
--- a/watchsimulator/include/OpenSSL/quic.h
+++ b/watchsimulator/include/OpenSSL/quic.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -24,11 +24,44 @@ extern "C" {
* Method used for non-thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_method(void);
+
/*
* Method used for thread-assisted QUIC client operation.
*/
__owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
+/*
+ * QUIC transport error codes (RFC 9000 s. 20.1)
+ */
+# define OSSL_QUIC_ERR_NO_ERROR 0x00
+# define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+# define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+# define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+# define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+# define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+# define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+# define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+# define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+# define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+# define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+# define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+# define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+# define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+# define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+# define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+# define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
+
+/* Inclusive range for handshake-specific errors. */
+# define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+# define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
+
+# define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+ (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
+
+/* Local errors. */
+# define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
+ ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
+
# ifdef __cplusplus
}
# endif
diff --git a/watchsimulator/include/OpenSSL/self_test.h b/watchsimulator/include/OpenSSL/self_test.h
index 11ef0da3..46a024d9 100644
--- a/watchsimulator/include/OpenSSL/self_test.h
+++ b/watchsimulator/include/OpenSSL/self_test.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,6 +46,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
# define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+# define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
# define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
@@ -71,6 +72,7 @@ extern "C" {
# define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
# define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
# define OSSL_SELF_TEST_DESC_RNG "RNG"
diff --git a/watchsimulator/include/OpenSSL/ssl.h b/watchsimulator/include/OpenSSL/ssl.h
index 0dbadf2f..006d063e 100644
--- a/watchsimulator/include/OpenSSL/ssl.h
+++ b/watchsimulator/include/OpenSSL/ssl.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/ssl.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@@ -449,6 +449,8 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
/* Enable KTLS TX zerocopy on Linux */
# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
+
/*
* Option "collections."
*/
@@ -1761,6 +1763,9 @@ __owur long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
__owur int SSL_SESSION_get_protocol_version(const SSL_SESSION *s);
__owur int SSL_SESSION_set_protocol_version(SSL_SESSION *s, int version);
+__owur time_t SSL_SESSION_get_time_ex(const SSL_SESSION *s);
+__owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
+
__owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
__owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
@@ -2014,6 +2019,12 @@ long SSL_callback_ctrl(SSL *, int, void (*)(void));
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
+# define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
+
+__owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
+ uint64_t flags,
+ size_t *written);
+
# define SSL_EARLY_DATA_NOT_SENT 0
# define SSL_EARLY_DATA_REJECTED 1
# define SSL_EARLY_DATA_ACCEPTED 2
@@ -2430,6 +2441,124 @@ __owur int SSL_get_conn_close_info(SSL *ssl,
SSL_CONN_CLOSE_INFO *info,
size_t info_len);
+# define SSL_VALUE_CLASS_GENERIC 0
+# define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
+
+# define SSL_VALUE_NONE 0
+# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+# define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+# define SSL_VALUE_EVENT_HANDLING_MODE 6
+# define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+# define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
+
+# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
+
+int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
+int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
+
+# define SSL_get_generic_value_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_set_generic_value_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
+# define SSL_get_feature_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_set_feature_request_uint(ssl, id, v) \
+ SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
+# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
+# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+ SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
+
+# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
+ (value))
+# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
+ (value))
+
+# define SSL_get_event_handling_mode(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+# define SSL_set_event_handling_mode(ssl, value) \
+ SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
+ (value))
+
+# define SSL_get_stream_write_buf_size(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
+ (value))
+# define SSL_get_stream_write_buf_used(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
+ (value))
+# define SSL_get_stream_write_buf_avail(ssl, value) \
+ SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
+ (value))
+
+# define SSL_POLL_EVENT_NONE 0
+
+# define SSL_POLL_EVENT_F (1U << 0) /* F (Failure) */
+# define SSL_POLL_EVENT_EL (1U << 1) /* EL (Exception on Listener) */
+# define SSL_POLL_EVENT_EC (1U << 2) /* EC (Exception on Conn) */
+# define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+# define SSL_POLL_EVENT_ER (1U << 4) /* ER (Exception on Read) */
+# define SSL_POLL_EVENT_EW (1U << 5) /* EW (Exception on Write) */
+# define SSL_POLL_EVENT_R (1U << 6) /* R (Readable) */
+# define SSL_POLL_EVENT_W (1U << 7) /* W (Writable) */
+# define SSL_POLL_EVENT_IC (1U << 8) /* IC (Incoming Connection) */
+# define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+# define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+# define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+# define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
+
+# define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+# define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+# define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+# define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+ | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+# define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+# define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+# define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+# define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+# define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+
+typedef struct ssl_poll_item_st {
+ BIO_POLL_DESCRIPTOR desc;
+ uint64_t events, revents;
+} SSL_POLL_ITEM;
+
+# define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
+
+__owur int SSL_poll(SSL_POLL_ITEM *items,
+ size_t num_items,
+ size_t stride,
+ const struct timeval *timeout,
+ uint64_t flags,
+ size_t *result_count);
+
+static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
+SSL_as_poll_descriptor(SSL *s)
+{
+ BIO_POLL_DESCRIPTOR d;
+
+ d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+ d.value.ssl = s;
+ return d;
+}
+
# ifndef OPENSSL_NO_DEPRECATED_1_1_0
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
diff --git a/watchsimulator/include/OpenSSL/sslerr.h b/watchsimulator/include/OpenSSL/sslerr.h
index 87413d95..5b3a4da5 100644
--- a/watchsimulator/include/OpenSSL/sslerr.h
+++ b/watchsimulator/include/OpenSSL/sslerr.h
@@ -125,6 +125,8 @@
# define SSL_R_EXT_LENGTH_MISMATCH 163
# define SSL_R_FAILED_TO_GET_PARAMETER 316
# define SSL_R_FAILED_TO_INIT_ASYNC 405
+# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+# define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
# define SSL_R_FRAGMENTED_CLIENT_HELLO 401
# define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
# define SSL_R_HTTPS_PROXY_REQUEST 155
@@ -225,6 +227,7 @@
# define SSL_R_PEM_NAME_BAD_PREFIX 391
# define SSL_R_PEM_NAME_TOO_SHORT 392
# define SSL_R_PIPELINE_FAILURE 406
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
# define SSL_R_PRIVATE_KEY_MISMATCH 288
# define SSL_R_PROTOCOL_IS_SHUTDOWN 207
@@ -348,10 +351,14 @@
# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
# define SSL_R_UNSOLICITED_EXTENSION 217
# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
# define SSL_R_UNSUPPORTED_PROTOCOL 258
# define SSL_R_UNSUPPORTED_SSL_VERSION 259
# define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+# define SSL_R_UNSUPPORTED_WRITE_FLAG 412
# define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
# define SSL_R_VERSION_TOO_HIGH 166
# define SSL_R_VERSION_TOO_LOW 396
diff --git a/watchsimulator/include/OpenSSL/sslerr_legacy.h b/watchsimulator/include/OpenSSL/sslerr_legacy.h
index bde52784..096d318f 100644
--- a/watchsimulator/include/OpenSSL/sslerr_legacy.h
+++ b/watchsimulator/include/OpenSSL/sslerr_legacy.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
-# define SSL_F_SSL_BAD_METHOD 0
# define SSL_F_SSL_BUILD_CERT_CHAIN 0
# define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
# define SSL_F_SSL_CACHE_CIPHERLIST 0
diff --git a/watchsimulator/include/OpenSSL/x509_vfy.h b/watchsimulator/include/OpenSSL/x509_vfy.h
index 8cf06024..776920e2 100644
--- a/watchsimulator/include/OpenSSL/x509_vfy.h
+++ b/watchsimulator/include/OpenSSL/x509_vfy.h
@@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/x509_vfy.h.in
*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -497,6 +497,7 @@ int X509_STORE_lock(X509_STORE *xs);
int X509_STORE_unlock(X509_STORE *xs);
int X509_STORE_up_ref(X509_STORE *xs);
STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
+STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
const X509_NAME *nm);
diff --git a/watchsimulator/lib/libcrypto.a b/watchsimulator/lib/libcrypto.a
index f47208f4..5dbdcbcf 100644
Binary files a/watchsimulator/lib/libcrypto.a and b/watchsimulator/lib/libcrypto.a differ
diff --git a/watchsimulator/lib/libssl.a b/watchsimulator/lib/libssl.a
index 88816df9..e9a017e0 100644
Binary files a/watchsimulator/lib/libssl.a and b/watchsimulator/lib/libssl.a differ