-
-
Notifications
You must be signed in to change notification settings - Fork 9.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Do not include sparse_array.o in libssl #22111
Conversation
sparse_array.o is not needed in libssl at 3.0.x version. Signed-off-by: Huiyue Xu <xuhuiyue@huawei.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
CI fuzz failure is unrelated, and I've raised issue #22114 to cover the broken 3.0 branch
How I can rebuild the CIFuzz? @tom-cosgrove-arm |
This is for 3.1 and 3.0 branches only as sparse arrays are used by QUIC. |
It is possible to do something for the master branch as well - i.e., make the sparse array added only when QUIC is enabled. However that would be a different patch. |
24 hours has passed since 'approval: done' was set, but as this PR has been updated in that time the label 'approval: ready to merge' is not being automatically set. Please review the updates and set the label manually. |
Do we even need this for QUIC? |
Why would we need this for QUIC? I just grepped for |
Ah, found the spot where it might look like libssl uses sparse arrays. However, it builds fine after this diff too: diff --git a/ssl/event_queue.c b/ssl/event_queue.c
index 49890a36b5..20f4020db5 100644
--- a/ssl/event_queue.c
+++ b/ssl/event_queue.c
@@ -9,7 +9,6 @@
#include <stdlib.h>
#include "internal/event_queue.h"
-#include "crypto/sparse_array.h"
#include "ssl_local.h"
struct ossl_event_queue_st { |
I saw that, it's just the header file and isn't actually used. |
Could this submission be merged? |
Our automation didn't send a reminder here. It's meant to. Possibly because this PR is against the 3.0 branch not master? |
So, should this be merged to master as well? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So, should this be merged to master as well?
I think it should be. My approval counts for master/3.1 and 3.0. It sounds like there should be a follow on PR to remove the spurious header file inclusion.
|
Merged to master, 3.1, and 3.0 branches. Thank you for your contribution. |
sparse_array.o is not needed in libssl at 3.0.x version. Signed-off-by: Huiyue Xu <xuhuiyue@huawei.com> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from #22111)
sparse_array.o is not needed in libssl at 3.0.x version. Signed-off-by: Huiyue Xu <xuhuiyue@huawei.com> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from openssl/openssl#22111) Signed-off-by: fly2x <fly2x@hitls.org>
sparse_array.o is not needed in libssl at 3.0.x version. Signed-off-by: Huiyue Xu <xuhuiyue@huawei.com> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from openssl/openssl#22111) (cherry picked from commit a31cd07af1ca34cdbbd2b077a933208d447ed0b2) Signed-off-by: fly2x <fly2x@hitls.org>
sparse_array.o is not needed in libssl at 3.0.x version. Signed-off-by: Huiyue Xu <xuhuiyue@huawei.com> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from openssl/openssl#22111) (cherry picked from commit a31cd07af1ca34cdbbd2b077a933208d447ed0b2) Signed-off-by: fly2x <fly2x@hitls.org>
sparse_array.o is not needed in libssl at 3.0.x version.
fix #22113
Checklist