FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

dtlsconnection: do not set keys_exported flag if actually not exported

Browse Source 
keys_exported flag should be set only if keys are actually exported.
For that the next conditions are needed:
  1 - SSL_export_keying_material on success
  2 - SSL_get_selected_srtp_profile returns a valid profile
  3 - The profile ID is SRTP_AES128_CM_SHA1_80 or SRTP_AES128_CM_SHA1_32

Also don't crash if NULL is returned as profile.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1156>
This commit is contained in:
Miguel Paris 2020-04-01 18:08:45 +02:00 committed by Sebastian Dröge
parent 117f593cff
commit 3dd2bbf23c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/dtls/gstdtlsconnection.c
View File

@ -895,6 +895,12 @@ export_srtp_keys (GstDtlsConnection * self)
profile = SSL_get_selected_srtp_profile (self->priv->ssl); profile = SSL_get_selected_srtp_profile (self->priv->ssl);
if (!profile) {
GST_WARNING_OBJECT (self,
"no srtp capabilities negotiated during handshake");
return;
}
GST_INFO_OBJECT (self, "keys received, profile is %s", profile->name); GST_INFO_OBJECT (self, "keys received, profile is %s", profile->name);
switch (profile->id) { switch (profile->id) {
@ -908,7 +914,7 @@ export_srtp_keys (GstDtlsConnection * self)
break; break;
default: default:
GST_WARNING_OBJECT (self, "invalid crypto suite set by handshake"); GST_WARNING_OBJECT (self, "invalid crypto suite set by handshake");
goto beach; return;
} }
client_key.key = exported_keys.client_key; client_key.key = exported_keys.client_key;
@ -928,7 +934,6 @@ export_srtp_keys (GstDtlsConnection * self)
auth); auth);
} }
beach:
self->priv->keys_exported = TRUE; self->priv->keys_exported = TRUE;
} }