mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-23 15:48:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: Implement pkcs7 unpadding

Browse source 
Every encrypted fragment will be a multiple of 128 bits, the last byte
contains the number of bytes that were added as padding in the end
and should be removed.

https://bugzilla.gnome.org/show_bug.cgi?id=701673
This commit is contained in:
Sebastian Dröge 2013-07-23 13:29:18 +02:00
parent 92bcdd9c4b
commit b9124cad88
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ext/hls/gsthlsdemux.c
View file

@ -1243,6 +1243,7 @@ gst_hls_demux_decrypt_fragment (GstHLSDemux * demux,
GstMapInfo key_info, encrypted_info, decrypted_info; GstMapInfo key_info, encrypted_info, decrypted_info;
gnutls_cipher_hd_t aes_ctx; gnutls_cipher_hd_t aes_ctx;
gnutls_datum_t key_d, iv_d; gnutls_datum_t key_d, iv_d;
gsize unpadded_size;
GST_INFO_OBJECT (demux, "Fetching key %s", key); GST_INFO_OBJECT (demux, "Fetching key %s", key);
key_fragment = gst_uri_downloader_fetch_uri (demux->downloader, key); key_fragment = gst_uri_downloader_fetch_uri (demux->downloader, key);
@ -1269,10 +1270,16 @@ gst_hls_demux_decrypt_fragment (GstHLSDemux * demux,
decrypted_info.data, decrypted_info.size); decrypted_info.data, decrypted_info.size);
gnutls_cipher_deinit (aes_ctx); gnutls_cipher_deinit (aes_ctx);
/* Handle pkcs7 unpadding here */
unpadded_size =
decrypted_info.size - decrypted_info.data[decrypted_info.size - 1];
gst_buffer_unmap (decrypted_buffer, &decrypted_info); gst_buffer_unmap (decrypted_buffer, &decrypted_info);
gst_buffer_unmap (encrypted_buffer, &encrypted_info); gst_buffer_unmap (encrypted_buffer, &encrypted_info);
gst_buffer_unmap (key_buffer, &key_info); gst_buffer_unmap (key_buffer, &key_info);
gst_buffer_resize (decrypted_buffer, 0, unpadded_size);
gst_buffer_unref (key_buffer); gst_buffer_unref (key_buffer);
gst_buffer_unref (encrypted_buffer); gst_buffer_unref (encrypted_buffer);
g_object_unref (key_fragment); g_object_unref (key_fragment);