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.

Sign up for GitHub

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

Jump to bottom

[20055] Fix build with TLS, but not security. #4156

Merged
merged 1 commit into from
Dec 18, 2023
Merged

[20055] Fix build with TLS, but not security. #4156

merged 1 commit into from
Dec 18, 2023

Conversation

MiguelCompany
Copy link
Member

@MiguelCompany MiguelCompany commented Dec 18, 2023 •
edited by EduPonz
Loading

Description

This fixes a build regression introduced by #2485 when SECURITY=OFF and NO_TLS=OFF.

@Mergifyio backport 2.12.x 2.11.x 2.10.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • N/A New feature has been added to the versions.md file (if applicable).
  • N/A New feature has been documented/Current behavior is correctly described in the documentation.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@MiguelCompany MiguelCompany added the no-test Skip CI tests if PR marked with this label label Dec 18, 2023
@MiguelCompany MiguelCompany added this to the v2.13.0 milestone Dec 18, 2023
@EduPonz
Copy link

EduPonz commented Dec 18, 2023

@richiprosima please test windows test mac

@MiguelCompany
Copy link
Member Author

@richiprosima Please test mac

2 similar comments
@MiguelCompany
Copy link
Member Author

@richiprosima Please test mac

@MiguelCompany
Copy link
Member Author

@richiprosima Please test mac

@EduPonz
Copy link

EduPonz commented Dec 18, 2023

@richiprosima please test mac

@EduPonz EduPonz merged commit fae8f1e into master Dec 18, 2023
8 checks passed
@EduPonz EduPonz deleted the hotfix/build-without-sec-but-with-tls branch December 18, 2023 15:18
@EduPonz
Copy link

EduPonz commented Dec 18, 2023

@Mergifyio backport 2.12.x 2.11.x 2.10.x 2.6.x

@mergify Mergify
Copy link
Contributor

mergify bot commented Dec 18, 2023 •
edited
Loading

backport 2.12.x 2.11.x 2.10.x 2.6.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Dec 18, 2023
@MiguelCompany @mergify
Fix build with TLS, but not security (#4156)
ad7c7a6 
Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit fae8f1e)
@mergify mergify bot mentioned this pull request Dec 18, 2023
Merged
mergify bot pushed a commit that referenced this pull request Dec 18, 2023
@MiguelCompany @mergify
Fix build with TLS, but not security (#4156)
3f6d982 
Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit fae8f1e)
mergify bot pushed a commit that referenced this pull request Dec 18, 2023
@MiguelCompany @mergify
Fix build with TLS, but not security (#4156)
f678508 
Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit fae8f1e)
This was referenced Dec 18, 2023
Merged
Merged
mergify bot pushed a commit that referenced this pull request Dec 18, 2023
@MiguelCompany @mergify
Fix build with TLS, but not security (#4156)
288ecd1 
Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit fae8f1e)

# Conflicts:
#	test/blackbox/common/BlackboxTestsSecurity.cpp
@mergify mergify bot mentioned this pull request Dec 18, 2023
Closed
EduPonz pushed a commit that referenced this pull request Dec 19, 2023
@mergify @MiguelCompany
Fix build with TLS, but not security (#4156) (#4163)
d5ec4ca 
Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit fae8f1e)

Co-authored-by: Miguel Company <[email protected]>
EduPonz pushed a commit that referenced this pull request Dec 20, 2023
@MiguelCompany @EduPonz
Fix build with TLS, but not security (#4156)
802222f 
Signed-off-by: Miguel Company <[email protected]>
elianalf pushed a commit that referenced this pull request Dec 20, 2023
@mergify @MiguelCompany
Fix build with TLS, but not security (#4156) (#4161)
f503db6 
Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit fae8f1e)

Co-authored-by: Miguel Company <[email protected]>
MiguelCompany added a commit that referenced this pull request Dec 21, 2023
@MiguelCompany
Fix build with TLS, but not security (#4156)
47b7c2a 
Signed-off-by: Miguel Company <[email protected]>
MiguelCompany added a commit that referenced this pull request Dec 21, 2023
@mergify @MiguelCompany
Fix build with TLS, but not security (#4156) (#4162)
5fd927f 
Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit fae8f1e)

Co-authored-by: Miguel Company <[email protected]>
MiguelCompany added a commit that referenced this pull request Dec 22, 2023
@mergify @JLBuenoLopez @MiguelCompany
Fix memory problem when ciphering payload (#2485) (#4153)
ffe3b0c 
* Fix memory problem when ciphering payload (#2485)

* Refs 13364. Regression test.

Signed-off-by: Miguel Company <[email protected]>

* Refs 13364. fix build when TLS_FOUND

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs 13364. Test with different lengths.

Signed-off-by: Miguel Company <[email protected]>

* Refs 13364. Apply review suggestions.

Signed-off-by: Miguel Company <[email protected]>

* Refs 13364. Fix #2379.

Signed-off-by: Miguel Company <[email protected]>

* Include what you use in DDSBlackboxTestsSecurity.cpp

Signed-off-by: Miguel Company <[email protected]>

* Refs #13364. Fix warning.
Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
Signed-off-by: Miguel Company <[email protected]>
Co-authored-by: Miguel Company <[email protected]>

* Fix build with TLS, but not security (#4156)

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
Signed-off-by: Miguel Company <[email protected]>
Co-authored-by: José Luis Bueno López <[email protected]>
Co-authored-by: Miguel Company <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@EduPonz EduPonz EduPonz approved these changes

Assignees
No one assigned
Labels
no-test Skip CI tests if PR marked with this label
Projects
None yet
Milestone
v2.13.0
Development

Successfully merging this pull request may close these issues.
2 participants
@MiguelCompany @EduPonz