From 016387fe0fe3eff1a03ec0673bf4d2967f6cad94 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Fri, 21 Oct 2016 12:40:05 +0300 Subject: rtmpdh: Don't use the OpenSSL DH struct MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead use our own struct, which we already use when using gcrypt and gnutls. In OpenSSL 1.1, the DH struct has been made opaque. Signed-off-by: Martin Storsjö --- libavformat/rtmpdh.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'libavformat/rtmpdh.h') diff --git a/libavformat/rtmpdh.h b/libavformat/rtmpdh.h index eb742dd937..5233de0905 100644 --- a/libavformat/rtmpdh.h +++ b/libavformat/rtmpdh.h @@ -26,7 +26,6 @@ #include "config.h" -#if CONFIG_GMP || CONFIG_GCRYPT #if CONFIG_GMP #include @@ -35,6 +34,12 @@ typedef mpz_ptr FFBigNum; #include typedef gcry_mpi_t FFBigNum; + +#elif CONFIG_OPENSSL +#include +#include + +typedef BIGNUM *FFBigNum; #endif typedef struct FF_DH { @@ -45,13 +50,6 @@ typedef struct FF_DH { long length; } FF_DH; -#elif CONFIG_OPENSSL -#include -#include - -typedef BIGNUM *FFBigNum; -typedef DH FF_DH; -#endif /** * Initialize a Diffie-Hellmann context. -- cgit v1.2.3