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

Update bio_info_cb to align with OpenSSL 3.x #1222

Merged
merged 2 commits into from
Oct 5, 2023
Merged

Conversation

justsmth
Copy link
Contributor

@justsmth justsmth commented Oct 3, 2023

Issues:

N/A

Description of changes:

  • Fixes compile warning from GCC 13.2:
/tmp/aws-lc/crypto/bio/connect.c: In function 'conn_callback_ctrl':
/tmp/aws-lc/crypto/bio/connect.c:493:29: error: cast between incompatible function types from 'bio_info_cb' {aka 'long int (*)(struct bio_st *, int,  const char *, int,  long int,  long int)'} to 'int (*)(const struct bio_st *, int,  int)' [-Werror=cast-function-type]
  493 |       data->info_callback = (int (*)(const struct bio_st *, int, int))fp;
      |                             ^
  • Updates bio_info_cb to align with its definition in OpenSSL 1.1.1 (and later).

Call-outs:

N/A

Testing:

  • Added test to very callback function can successfully be invoked.
  • Verified compilation succeeds with GCC 13.2.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.

@justsmth justsmth requested a review from skmcgrail October 3, 2023 20:10
skmcgrail
skmcgrail previously approved these changes Oct 3, 2023
Copy link
Member

@skmcgrail skmcgrail left a comment

Choose a reason for hiding this comment

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

Devicefarm failure seems unrelated?

ERROR: Failed building wheel for pyyaml

@justsmth justsmth marked this pull request as ready for review October 4, 2023 11:37
@justsmth justsmth requested a review from a team as a code owner October 4, 2023 11:37
@justsmth
Copy link
Contributor Author

justsmth commented Oct 4, 2023

Devicefarm failure seems unrelated?

ERROR: Failed building wheel for pyyaml

Yeah, it succeeded on retry.

@justsmth justsmth enabled auto-merge (squash) October 4, 2023 22:05
crypto/bio/bio_test.cc Outdated Show resolved Hide resolved
@justsmth justsmth merged commit a726532 into aws:main Oct 5, 2023
@justsmth justsmth deleted the bio_info_cb branch October 9, 2023 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants