Skip to content
New issue

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

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

Two CI failure fixes #21411

Closed
wants to merge 2 commits into from
Closed

Two CI failure fixes #21411

wants to merge 2 commits into from

Conversation

t8m
Copy link
Member

@t8m t8m commented Jul 10, 2023

ossl_quic_wire_encode_pkt_hdr(): Assign ptrs only on static buf wpkt

Pointers can be invalidated when the underlying BUF_MEM grows.

quicapitest: Fix SSL_trace() test on big endian platforms

The structure member (of int type) is used as single byte value which works only on little endian platforms. Use the correct type.

Pointers can be invalidated when the underlying BUF_MEM grows.
@t8m t8m added branch: master Merge to master branch approval: review pending This pull request needs review by a committer approval: otc review pending This pull request needs review by an OTC member triaged: bug The issue/pr is/fixes a bug severity: urgent Fixes an urgent issue (exempt from 24h grace period) tests: exempted The PR is exempt from requirements for testing labels Jul 10, 2023
@@ -63,7 +63,7 @@ typedef struct ossl_record_layer_st OSSL_RECORD_LAYER;
* buffer of payload data in |buf| of length |buflen|.
*/
struct ossl_record_template_st {
int type;
unsigned char type;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this change?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To fix big endian failures as seen here: https://github.com/openssl/openssl/actions/runs/5507119256

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There could be alternative approaches however we IMO depend on the type being just one byte if not anywhere else then in the SSL_trace() call when it is invoked from the ssl message callback.

@t8m t8m changed the title ossl_quic_wire_encode_pkt_hdr(): Assign ptrs only on static buf wpkt Two CI failure fixes Jul 11, 2023
@paulidale paulidale removed the approval: otc review pending This pull request needs review by an OTC member label Jul 12, 2023
@hlandau hlandau added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Jul 12, 2023
@hlandau
Copy link
Member

hlandau commented Jul 12, 2023

OK with urgent

@hlandau hlandau added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Jul 13, 2023
@t8m
Copy link
Member Author

t8m commented Jul 14, 2023

Merged to master branch. Thank you for the reviews.

@t8m t8m closed this Jul 14, 2023
openssl-machine pushed a commit that referenced this pull request Jul 14, 2023
Pointers can be invalidated when the underlying BUF_MEM grows.

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from #21411)
openssl-machine pushed a commit that referenced this pull request Jul 14, 2023
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from #21411)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Merge to master branch severity: urgent Fixes an urgent issue (exempt from 24h grace period) tests: exempted The PR is exempt from requirements for testing triaged: bug The issue/pr is/fixes a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants