diff options
| author | Martin Storsjö <martin@martin.st> | 2016-10-21 12:40:05 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2016-10-23 22:02:01 +0300 |
| commit | 016387fe0fe3eff1a03ec0673bf4d2967f6cad94 (patch) | |
| tree | 51d26a7746ae254c440552c2e30a2d2d725c6ddd /libavformat/rtmpdh.h | |
| parent | 2f806622e1270d3ed1d41a53049a19673dafbe70 (diff) | |
rtmpdh: Don't use the OpenSSL DH struct
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ö <martin@martin.st>
Diffstat (limited to 'libavformat/rtmpdh.h')
| -rw-r--r-- | libavformat/rtmpdh.h | 14 |
1 files changed, 6 insertions, 8 deletions
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 <gmp.h> @@ -35,6 +34,12 @@ typedef mpz_ptr FFBigNum; #include <gcrypt.h> typedef gcry_mpi_t FFBigNum; + +#elif CONFIG_OPENSSL +#include <openssl/bn.h> +#include <openssl/dh.h> + +typedef BIGNUM *FFBigNum; #endif typedef struct FF_DH { @@ -45,13 +50,6 @@ typedef struct FF_DH { long length; } FF_DH; -#elif CONFIG_OPENSSL -#include <openssl/bn.h> -#include <openssl/dh.h> - -typedef BIGNUM *FFBigNum; -typedef DH FF_DH; -#endif /** * Initialize a Diffie-Hellmann context. |