-
-
Notifications
You must be signed in to change notification settings - Fork 9.7k
obs-outputs: Add mbedTLS support to libRTMP #1360
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
Closed
Closed
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
8ba228f
obs-outputs: Add support for and use mbedTLS for SSL
compiler-errors abc35b1
obs-outputs: Fix OS-specific mbedTLS cmake rules
compiler-errors bf82d89
rtmp-services: Change Facebook stream URL to use RTMPS
compiler-errors 748ce31
obs-outputs: Add RTMPS to new network stack
compiler-errors abfe3c5
obs-outputs: Enable RTMPS, strict cert check by default
compiler-errors dae47d2
obs-outputs: Load root certs on MacOS/Windows
compiler-errors e37add8
obs-outputs: Improve mbedTLS support
notr1ch bd2ec74
obs-outputs: Update CMakeLists for RTMPS support
compiler-errors 06f288b
obs-outputs: Change mbedTLS build options
compiler-errors File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
obs-outputs: Add support for and use mbedTLS for SSL
This diff adds mbedTLS support. PolarSSL and mbedTLS have grown so different between 2015-or-so when libRTMP was written and now that it's no longer feasible to just use the USE_POLARSSL flag that is present in libRTMP already. I kept the old PolarSSL flag, but now there's USE_MBEDTLS instead which uses the library more responsibly due to the introduction of a bunch of _init and _free functions, etc. Right now we're statically linking, meaning that the dependency on mbedTLS on the client machine is not necessary and which alleviates concerns of shipping OBS with this flag on by default.
- Loading branch information
commit 8ba228f942d6d044970dce00e79ee29ec03ca9e0
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| # Once done these will be defined: | ||
| # | ||
| # MBEDTLS_LIB | ||
| # MBEDTLS_INCLUDE_DIRS | ||
| # MBEDTLS_LIBRARIES | ||
|
|
||
| find_path(MBEDTLS_INCLUDE_DIR | ||
| NAMES mbedtls/ssl.h | ||
| HINTS | ||
| ${_MBEDTLS_INCLUDE_DIRS} | ||
| PATHS | ||
| /usr/include /usr/local/include /opt/local/include) | ||
|
|
||
| find_library(MBEDTLS_LIB | ||
| NAMES libmbedtls.a | ||
| HINTS | ||
| ${_MBEDTLS_LIBRARY_DIRS} | ||
| PATHS | ||
| /usr/lib /usr/local/lib /opt/local/lib) | ||
|
|
||
| find_library(MBEDCRYPTO_LIB | ||
| NAMES libmbedcrypto.a | ||
| HINTS | ||
| ${_MBEDTLS_LIBRARY_DIRS} | ||
| PATHS | ||
| /usr/lib /usr/local/lib /opt/local/lib) | ||
|
|
||
| find_library(MBEDX509_LIB | ||
| NAMES libmbedx509.a | ||
| HINTS | ||
| ${_MBEDTLS_LIBRARY_DIRS} | ||
| PATHS | ||
| /usr/lib /usr/local/lib /opt/local/lib) | ||
|
|
||
| mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_ARCH_INCLUDE_DIR MBEDTLS_LIB MBEDCRYPTO_LIB MBEDX509_LIB) | ||
|
|
||
| if(MBEDTLS_LIB AND MBEDCRYPTO_LIB AND MBEDX509_LIB) | ||
| set(MBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR} ${MBEDTLS_ARCH_INCLUDE_DIR}) | ||
| set(MBEDTLS_LIBRARIES ${MBEDTLS_LIB} ${MBEDCRYPTO_LIB} ${MBEDX509_LIB}) | ||
| set(MBEDTLS_FOUND 1) | ||
| else() | ||
| message (WARNING "Some mbed libs not found. TLS: ${MBEDTLS_LIB}, CRYPTO: ${MBEDCRYPTO_LIB}, x509: ${MBEDX509_LIB}") | ||
| set(MBEDTLS_FOUND 0) | ||
| endif() |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this may be better if the default is
ONfor this option. Facebook won't function without it if it's set to rtmps anyway.