Fix Botan build and test failures#771
Merged
jschlyter merged 3 commits intosofthsm:developfrom Nov 29, 2024
Merged
Conversation
The ECB handling of Botan 2.0 was added in "Issue softhsm#276: Support for Botan 2.0 softhsm#294" softhsm#294 but then removed in: softhsm#717 via: softhsm@8fd89ec This commit reverts parts of this commit and additionally removes the used define BOTAN_DLL. The functions in Botan_ecb.h are library-local but building on Windows fails due link failue. Signed-off-by: Björn Svensson <bjorn.a.svensson@est.tech>
The test can be re-enabled when we support Botan 3 due to: randombit/botan#3933 Signed-off-by: Björn Svensson <bjorn.a.svensson@est.tech>
The CI installed libraries botan and openssl (x86 only) lacks support for ECC and EDDSA, which now are disabled during the CI builds. Windows x64 with OpenSSL still builds and runs these tests. Signed-off-by: Björn Svensson <bjorn.a.svensson@est.tech>
jschlyter
approved these changes
Nov 29, 2024
Contributor
|
Nice work! |
Contributor
Author
|
I'll look into if I can get it faster with caching or something similar, it seems awfully slow.. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR includes the following commits to be able to run all tests on the different platforms in CI.
Revert removal of Botan 2.0 ECB handling
The ECB handling was added when Botan 2.0 was introduced via:
Issue #276: Support for Botan 2.0 #294
but then removed by comments in (and later removed completely):
Amend PR 644 resolving conflicts and improvements #717 via: 8fd89ec
This commit reverts parts of this commit to get a stable state.
We could remove it fully in a separate PR, but then we should also remove the files Botan_ecb.h and Botan_ecb.cpp,
and avoid running some tests on Botan.
Correcting build options for Windows in CI
The CI installed libraries
BotanandOpenSSL(x86 only) lacks support forECCandEDDSA,which now are disabled during the CI builds. This fixes the build errors.
Windows x64 with OpenSSL still builds and runs these tests.
Remove testing of unsupported
ED448in Botan 2The test can be re-enabled when we support Botan 3, see Feature: x448 and Ed448 randombit/botan#3933
Today we only support Botan 2 in autoconf/CMake.
Fixes #767