From b55f380b20f9a1d4d11f92ef5da603f83d250cd6 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Wed, 6 Nov 2019 15:07:44 +0100 Subject: [PATCH] hlsdemux: Don't use deprecated SSL methods And instead use the fixed-size variants (which aren't deprecated) --- ext/hls/gsthlsdemux.c | 4 ++-- ext/hls/gsthlsdemux.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/hls/gsthlsdemux.c b/ext/hls/gsthlsdemux.c index b5fe60e91e..6b9c7836c8 100644 --- a/ext/hls/gsthlsdemux.c +++ b/ext/hls/gsthlsdemux.c @@ -1735,7 +1735,7 @@ static gboolean gst_hls_demux_stream_decrypt_start (GstHLSDemuxStream * stream, 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); return TRUE; @@ -1748,7 +1748,7 @@ decrypt_fragment (GstHLSDemuxStream * stream, gsize length, if (length % 16 != 0) return FALSE; - CBC_DECRYPT (&stream->aes_ctx, aes_decrypt, length, decrypted_data, + CBC_DECRYPT (&stream->aes_ctx, aes128_decrypt, length, decrypted_data, encrypted_data); return TRUE; diff --git a/ext/hls/gsthlsdemux.h b/ext/hls/gsthlsdemux.h index 529cd1961e..3dc2de023a 100644 --- a/ext/hls/gsthlsdemux.h +++ b/ext/hls/gsthlsdemux.h @@ -107,7 +107,7 @@ struct _GstHLSDemuxStream EVP_CIPHER_CTX *aes_ctx; # endif #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) gcry_cipher_hd_t aes_ctx; #endif