12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758 |
- https://raw.githubusercontent.com/gentoo/libressl/master/media-video/ffmpeg/files/ffmpeg-3.3-libressl.patch
- --- ffmpeg-3.4.1.orig/libavformat/tls_openssl.c 2017-12-10 22:35:10.000000000 +0100
- +++ ffmpeg-3.4.1/libavformat/tls_openssl.c 2018-02-12 18:03:02.844775701 +0100
- @@ -43,7 +43,7 @@ typedef struct TLSContext {
- TLSShared tls_shared;
- SSL_CTX *ctx;
- SSL *ssl;
- -#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
- +#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
- BIO_METHOD* url_bio_method;
- #endif
- } TLSContext;
- @@ -68,7 +68,7 @@ static unsigned long openssl_thread_id(v
-
- static int url_bio_create(BIO *b)
- {
- -#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
- +#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
- BIO_set_init(b, 1);
- BIO_set_data(b, NULL);
- BIO_set_flags(b, 0);
- @@ -85,7 +85,7 @@ static int url_bio_destroy(BIO *b)
- return 1;
- }
-
- -#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
- +#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
- #define GET_BIO_DATA(x) BIO_get_data(x)
- #else
- #define GET_BIO_DATA(x) (x)->ptr
- @@ -129,7 +129,7 @@ static int url_bio_bputs(BIO *b, const c
- return url_bio_bwrite(b, str, strlen(str));
- }
-
- -#if OPENSSL_VERSION_NUMBER < 0x1010000fL
- +#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
- static BIO_METHOD url_bio_method = {
- .type = BIO_TYPE_SOURCE_SINK,
- .name = "urlprotocol bio",
- @@ -208,7 +208,7 @@ static int tls_close(URLContext *h)
- SSL_CTX_free(c->ctx);
- if (c->tls_shared.tcp)
- ffurl_close(c->tls_shared.tcp);
- -#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
- +#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
- if (c->url_bio_method)
- BIO_meth_free(c->url_bio_method);
- #endif
- @@ -266,7 +266,7 @@ static int tls_open(URLContext *h, const
- ret = AVERROR(EIO);
- goto fail;
- }
- -#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
- +#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
- p->url_bio_method = BIO_meth_new(BIO_TYPE_SOURCE_SINK, "urlprotocol bio");
- BIO_meth_set_write(p->url_bio_method, url_bio_bwrite);
- BIO_meth_set_read(p->url_bio_method, url_bio_bread);
|