hlsdemux: Don't use deprecated SSL methods
And instead use the fixed-size variants (which aren't deprecated)
This commit is contained in:
parent
7bceb6c3ff
commit
b55f380b20
@ -1735,7 +1735,7 @@ static gboolean
|
|||||||
gst_hls_demux_stream_decrypt_start (GstHLSDemuxStream * stream,
|
gst_hls_demux_stream_decrypt_start (GstHLSDemuxStream * stream,
|
||||||
const guint8 * key_data, const guint8 * iv_data)
|
const guint8 * key_data, const guint8 * iv_data)
|
||||||
{
|
{
|
||||||
aes_set_decrypt_key (&stream->aes_ctx.ctx, 16, key_data);
|
aes128_set_decrypt_key (&stream->aes_ctx.ctx, key_data);
|
||||||
CBC_SET_IV (&stream->aes_ctx, iv_data);
|
CBC_SET_IV (&stream->aes_ctx, iv_data);
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
@ -1748,7 +1748,7 @@ decrypt_fragment (GstHLSDemuxStream * stream, gsize length,
|
|||||||
if (length % 16 != 0)
|
if (length % 16 != 0)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
CBC_DECRYPT (&stream->aes_ctx, aes_decrypt, length, decrypted_data,
|
CBC_DECRYPT (&stream->aes_ctx, aes128_decrypt, length, decrypted_data,
|
||||||
encrypted_data);
|
encrypted_data);
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
@ -107,7 +107,7 @@ struct _GstHLSDemuxStream
|
|||||||
EVP_CIPHER_CTX *aes_ctx;
|
EVP_CIPHER_CTX *aes_ctx;
|
||||||
# endif
|
# endif
|
||||||
#elif defined(HAVE_NETTLE)
|
#elif defined(HAVE_NETTLE)
|
||||||
struct CBC_CTX (struct aes_ctx, AES_BLOCK_SIZE) aes_ctx;
|
struct CBC_CTX (struct aes128_ctx, AES_BLOCK_SIZE) aes_ctx;
|
||||||
#elif defined(HAVE_LIBGCRYPT)
|
#elif defined(HAVE_LIBGCRYPT)
|
||||||
gcry_cipher_hd_t aes_ctx;
|
gcry_cipher_hd_t aes_ctx;
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user