Fix [switch_core_media.c]: Store the last local crypto key #952
Conversation
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
Now storing the local key corresponding to the crypto type that was negotiated with the remote side in the channel variable 'rtp_last_audio_local_crypto_key'.
Contributor
|
Can you more widely describe what you are trying to fix here? |
|
From the comments in the commit: Now storing the local key corresponding to the crypto type that was negotiated with the remote side in the channel variable 'rtp_last_audio_local_crypto_key'. We found that during call recovery, TLS negotiation would fail because this variable was sent to the "last crypto key in the list", not the "negotiated crypto key". This fix allows the recovered TLS call to use the key that had been previously negotiated. |
andywolk
requested changes
Nov 17, 2020
| if (engine->type == SWITCH_MEDIA_TYPE_AUDIO) { | ||
| switch_channel_set_variable(session->channel, "srtp_remote_audio_crypto_key", crypto); | ||
| switch_channel_set_variable_printf(session->channel, "srtp_remote_audio_crypto_type", "%s", switch_core_media_crypto_type2str(ctype)); | ||
| switch_channel_set_variable_printf(session->channel, "rtp_last_audio_local_crypto_key", "%s", engine->ssec[engine->crypto_type].local_crypto_key); |
Contributor
There was a problem hiding this comment.
What about VIDEO and TEXT? See "rtp_last_%s_local_crypto_key", type2str(type)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Now storing the local key corresponding to the crypto type that was negotiated with the remote side
in the channel variable 'rtp_last_audio_local_crypto_key'.