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

problem: sha external file conflict with czmq #3677

Merged
merged 2 commits into from
Sep 11, 2019
Merged

problem: sha external file conflict with czmq #3677

merged 2 commits into from
Sep 11, 2019

Conversation

somdoron
Copy link
Member

Solution: use external library for sha1.

Part of this commit is making websocket transport optionable

@somdoron
Copy link
Member Author

I still need to install nss as part of the CIs

@somdoron
Copy link
Member Author

it seems that building nss on windows is not going to be easy, it requires MozillaBuild...
https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Building

bluca
bluca reviewed Sep 10, 2019
View reviewed changes
src/ctx.cpp Outdated Show resolved Hide resolved
@bluca
Copy link
Member

bluca commented Sep 10, 2019

it seems that building nss on windows is not going to be easy, it requires MozillaBuild...
https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Building

It should be fine to keep the dependency optional, and fallback to the external sources on windows - given it's now optional, if people need to static link with czmq they can either figure it out or disable this protocol

@somdoron
Copy link
Member Author

@bluca done, now you can use nss instead of built-in or disable ws transport completely

@bluca
Copy link
Member

bluca commented Sep 11, 2019

Nice!

@somdoron somdoron changed the title WIP: problem: sha external file conflict with czmq problem: sha external file conflict with czmq Sep 11, 2019
@somdoron somdoron mentioned this pull request Sep 11, 2019
Closed
@somdoron
problem: sha1 external module conflict with czmq
9be8334 
Solution: allow to use external library (nss) for sha1 to avoid the conflict
@somdoron
problem: ci doesn't build with nss
2fb9e93 
Solution: add an nss build to CI
@somdoron
Copy link
Member Author

ready to be merged.
Appveyor is failing on a flapping test and issue with the ci build script.

@bluca bluca merged commit adf348b into zeromq:master Sep 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bluca bluca bluca left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@somdoron @bluca