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

cdp: Fix for undefined symbols when using older/unsupported OpenSSL #3616

Merged
merged 1 commit into from
Nov 2, 2023

Conversation

mtryfoss
Copy link
Member

This was originaly fixed in #3601, but that did not handle the change in #3612 very well.

Pre-Submission Checklist

  • Commit message has the format required by CONTRIBUTING guide
  • Commits are split per component (core, individual modules, libs, utils, ...)
  • Each component has a single commit (if not, squash them into one commit)
  • No commits to README files for modules (changes must be done to docbook files
    in doc/ subfolder, the README file is autogenerated)

Type Of Change

  • Small bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds new functionality)
  • Breaking change (fix or feature that would change existing functionality)

Checklist:

  • PR should be backported to stable branches
  • Tested changes locally
  • Related to issue #XXXX (replace XXXX with an open issue number)

Description

Fix for undefined symbols when using older/unsupported OpenSSL.
This was originaly fixed in #3601, but that did not handle the change in #3612 very well.

This was originaly fixed in kamailio#3601, but that did not handle the change in kamailio#3612 very well.
@henningw
Copy link
Contributor

Thanks. The PR #3601 was merged already. I did looked to this change, but did not spotted why the error clearing added yesterday caused additional problems here?

@mtryfoss
Copy link
Member Author

There's a big "#if OPENSSL_VERSION_NUMBER >= 0x10100000L" in cdp_tls.c, basically making the whole file empty for older versions.

sp->tls_conn would never be true in do_read() and do_write() if there was no supported openssl, so I didn't find any need to change those functions - until your mod yesterday which included a function defined in cdp_tls.c :)

@mtryfoss mtryfoss closed this Oct 25, 2023
@mtryfoss mtryfoss reopened this Oct 25, 2023
@mtryfoss
Copy link
Member Author

Sorry - closed by mistake. Reopened.

@henningw
Copy link
Contributor

Thanks for the clarification. Lets wait until the CI tests are done and then it will be merged, if there are no more comments.

@miconda miconda merged commit ba72724 into kamailio:master Nov 2, 2023
8 checks passed
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.

None yet

3 participants