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

Add support for Mosquitto OSP #6460

Merged
merged 3 commits into from
Jul 19, 2024
Merged

Add support for Mosquitto OSP #6460

merged 3 commits into from
Jul 19, 2024

Conversation

embhorn
Copy link
Member

@embhorn embhorn commented May 31, 2023

Description

To support mosquitto OSP
Add SSL_CTX_set_dh_auto stub
Add --enable-mosquitto config option

Testing

wolfSSL

git clone https://github.com/wolfSSL/wolfssl.git
cd wolfssl
./autogen.sh
./configure --enable-mosquitto CFLAGS="-DALLOW_INVALID_CERTSIGN"
make
make install

Mosquito OSP patch
https://github.com/wolfSSL/osp/blob/master/mosquitto/2.0.18.patch

Eclipse Mosquitto

git clone https://github.com/eclipse/mosquitto.git
cd mosquitto
git checkout v2.0.18
patch -p1 < <path/to/patch/file>
make WITH_TLS=wolfssl
make WITH_TLS=wolfssl ptest

Checklist

  • added tests
  • updated/added doxygen
  • updated appropriate READMEs
  • Updated manual and documentation

@embhorn embhorn self-assigned this May 31, 2023
wolfssl/openssl/ssl.h Outdated Show resolved Hide resolved
@embhorn embhorn changed the title Add SSL_CTX_set_dh_auto Add support for Mosquitto OSP Jun 1, 2023
Copy link
Contributor

@kareem-wolfssl kareem-wolfssl left a comment

Choose a reason for hiding this comment

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

Looks good to me. Seeing some test failures from Mosquitto which we discussed on Slack.

Apologies for forgetting this in the initial review, we are trying to test all OSP integrations using Github Actions. Please add an action to test Mosquitto. The tests are located in .github/workflows

@embhorn
Copy link
Member Author

embhorn commented May 15, 2024

Converted to draft. Will revisit effort when prioritized.

Copy link
Member

@julek-wolfssl julek-wolfssl left a comment

Choose a reason for hiding this comment

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

Nice work. I have some comments on the action.

.github/workflows/mosquitto.yml Outdated Show resolved Hide resolved
.github/workflows/mosquitto.yml Outdated Show resolved Hide resolved
.github/workflows/mosquitto.yml Outdated Show resolved Hide resolved
.github/workflows/mosquitto.yml Outdated Show resolved Hide resolved
.github/workflows/mosquitto.yml Outdated Show resolved Hide resolved
.github/workflows/mosquitto.yml Outdated Show resolved Hide resolved
.github/workflows/mosquitto.yml Outdated Show resolved Hide resolved
.github/workflows/mosquitto.yml Outdated Show resolved Hide resolved
.github/workflows/mosquitto.yml Outdated Show resolved Hide resolved
wolfssl/openssl/ssl.h Outdated Show resolved Hide resolved
@embhorn embhorn force-pushed the mosquitto_osp branch 5 times, most recently from 2a33a61 to 11113d8 Compare June 7, 2024 20:46
Copy link
Member

@julek-wolfssl julek-wolfssl left a comment

Choose a reason for hiding this comment

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

Last fix.

sudo apt-get install -y build-essential libev-dev libssl-dev automake python3-docutils libcunit1 libcunit1-doc libcunit1-dev pkg-config make

- name: Checkout mosquitto
uses: actions/checkout@v3
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
uses: actions/checkout@v3
uses: actions/checkout@v4

run: |
cd $GITHUB_WORKSPACE/mosquitto/
patch -p1 < $GITHUB_WORKSPACE/osp/mosquitto/${{ matrix.ref }}.patch
make WITH_TLS=wolfssl WITH_CJSON=no WITH_DOCS=no -j
Copy link
Member

Choose a reason for hiding this comment

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

Will need to use WOLFSSLDIR to point to the location of wolfSSL.

@embhorn
Copy link
Member Author

embhorn commented Jun 10, 2024

Tabs-to-spaces from my editor messed up the patch file
wolfSSL/osp#178

@embhorn
Copy link
Member Author

embhorn commented Jun 28, 2024

Fixed a bunch of failing mosquitto tests by concatenating the server cert with the CA. Should be good for final review now.

@embhorn embhorn marked this pull request as ready for review July 15, 2024 23:17
@embhorn embhorn assigned julek-wolfssl and unassigned embhorn Jul 15, 2024
julek-wolfssl
julek-wolfssl previously approved these changes Jul 16, 2024
@dgarske dgarske merged commit 0eeae4d into wolfSSL:master Jul 19, 2024
121 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.

5 participants