On Mon, Oct 10, 2016 at 07:30:16AM +1100, Matt Oliver wrote:
> From ad4d838ed6673c6d12aeaa7b00036b66371b4d63 Mon Sep 17 00:00:00 2001
> From: Matt Oliver <protogo...@gmail.com>
> Date: Mon, 10 Oct 2016 06:49:54 +1100
> Subject: [PATCH] openssl: Support version 1.1.0.
>
> Fixes #5675
>
> Signed-off-by: Matt Oliver <protogo...@gmail.com>
> ---
> configure | 3 +-
> libavformat/tls_openssl.c | 163
> ++++++++++++++++++++++++++++------------------
> 2 files changed, 102 insertions(+), 64 deletions(-)
>
> diff --git a/configure b/configure
> index e014615..3a92eb3 100755
> --- a/configure
> +++ b/configure
> @@ -5816,7 +5816,8 @@ enabled omx && { check_header
> OMX_Core.h ||
> add_cflags -isystem/opt/vc/include/IL
> ; }
> check_header OMX_Core.h ; } ||
> die "ERROR: OpenMAX IL headers not found"; }
> -enabled openssl && { use_pkg_config openssl openssl/ssl.h
> SSL_library_init ||
> +enabled openssl && { use_pkg_config openssl openssl/ssl.h
> OPENSSL_init_ssl ||
> + use_pkg_config openssl openssl/ssl.h
> SSL_library_init ||
> check_lib openssl/ssl.h SSL_library_init
> -lssl -lcrypto ||
> check_lib openssl/ssl.h SSL_library_init
> -lssl32 -leay32 ||
> check_lib openssl/ssl.h SSL_library_init
> -lssl -lcrypto -lws2_32 -lgdi32 ||
> diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c
> index 46eb3e6..2206ab0 100644
> --- a/libavformat/tls_openssl.c
> +++ b/libavformat/tls_openssl.c
> @@ -63,6 +63,89 @@ static unsigned long openssl_thread_id(void)
> #endif
> #endif
>
> +static int url_bio_create(BIO *b)
> +{
> +#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
> + BIO_set_init(b, 1);
> + BIO_set_data(b, NULL);
> + BIO_set_flags(b, 0);
> +#else
> + b->init = 1;
> + b->ptr = NULL;
> + b->flags = 0;
> +#endif
> + return 1;
> +}
> +
> +static int url_bio_destroy(BIO *b)
> +{
> + return 1;
> +}
> +
> +#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
> +#define BIO_GET_DATA(x) BIO_get_data(x);doesnt this step on the namespace used by openssl ? except that no objections / no further comments frome Tested to build fine on mingw32/64 & linux 32/64 x86 [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Many things microsoft did are stupid, but not doing something just because microsoft did it is even more stupid. If everything ms did were stupid they would be bankrupt already.
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
