From patchwork Tue Nov 7 12:28:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 5915 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp4059743jah; Tue, 7 Nov 2017 04:29:22 -0800 (PST) X-Google-Smtp-Source: ABhQp+TkysCd2J20TvCza10LkH6Cq/wuXb++wR4tovdsonLKVyA46zAwvzKk5FJrjKGf9ddCVwQ/ X-Received: by 10.28.125.206 with SMTP id y197mr1413830wmc.85.1510057762673; Tue, 07 Nov 2017 04:29:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510057762; cv=none; d=google.com; s=arc-20160816; b=SzYMX5v9YUE7oUYHoPQQOWs8+yGuYfSBHixtVcSAdagv5QsHtTZpnAPV1oqQljjVeG pqXjT5niZ669J+66z+6UCiabgWkB6Jt4tTD0JKkmySijRyCqHF9KvO5CoGvunhk+9JuO ZWUeCO7f6J/ZdMkNFctTtzGVLj6oNIiy2vBeEVps/tbDUWtI3RL8CG0gEbUqzvTI3C8p Tu+/cTh7NJ9ih9qVeLt6yUGjMcQzuXzGJ8iYMy8+6O/QLCKsFiyab+1bTOPnPfHvINDc 3TFHcBEqRg3tUBtORUiJfn4fE+Q23mt6cFNytCPs/ou6c2oWGhhtbiyfJIhK/hje5NVM 3UNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=eAfQBU9/cYcpHlhQ2Od+sR3RneclfjJvmk0SH3X9q18=; b=pcejW+YqA6B44lVQNkKKsjzpLeqQSm9dns4JkDRtS2VjEz3WKaOvWz8oK/l3Pa7yIk AatRAkpEhxFMD4Y4u9hsLoMnrQWdbSumhzoZjZ6j2SrX+hEv8H+poLq4jiOECxc4fhD8 Yz6cefWqqOzvxKtm5PtwzHJG+othi6kwee+ezA01lsoEZJMqzm+U4IcveySLA4GHWY5+ sVa9MtKySPVKeZZFDqWcG6AS6vKkZyES6j91eK37iC/8ICFn37KhJyDqlNfFDDBXmXd9 tlUUfX1NJZE2YTUeKbypnbZH8C/8rjK2k98U7G7blkKOEYeN24mXJS7TJykjvsY84rvo 0CfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=d9FJH0ny; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t6si1067403wmg.79.2017.11.07.04.29.21; Tue, 07 Nov 2017 04:29:22 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=d9FJH0ny; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 43AFA6891DF; Tue, 7 Nov 2017 14:29:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f169.google.com (mail-io0-f169.google.com [209.85.223.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7BFD68838A for ; Tue, 7 Nov 2017 14:29:00 +0200 (EET) Received: by mail-io0-f169.google.com with SMTP id h70so1929345ioi.4 for ; Tue, 07 Nov 2017 04:29:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=565Pa67pagmwerzz1wcBydxLio6CsSA8RKbARd65ORo=; b=d9FJH0nyPxRDmnMtiJeFB26pgz91yKrp3zaUK4943vSvRuQifoP8MIHTwep5sITiP+ QW6sGINg7FY5X1sbUEPoBX+/2mi9/sNAuLXwYwzQYN+Q5e+bwt258PoI5t1iHXDRJRJa z8T3+e4DCdFIEMbS/SHw2MqioFlYauVmQUYMbRumiqXSyQnsix1biJ+1pQfQjC5A/zn8 OGWlIP5TKMdNlW2CoQtpHVJ5cwDX0M47cQIj6KiYUmeGruWuLnxIQMjggLM1i6xAnSZ4 0AFDXY0ODt/zhiVnqPi/Bvo6CyERFiKltv/lbLfaaW5FGpB9Ctx7my9GIG5Sc2Z7pR+j C7RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=565Pa67pagmwerzz1wcBydxLio6CsSA8RKbARd65ORo=; b=OMMsutL+vPmqpfpVOA+8L1nZgAONbKM5t/bbuHh6xZ+yycxb1qKbiXAa3W5oyFQysK SoyHdM0eQzobxOOrq59nplW1++PPxzCBSRHS/q/x8pSO97PGLs7GAvQFngy5+U265y1u qzaDEfkPQs07bsXnTcKMwmUr/KO+/RZF2y55lqiEkx2mRvfUshRenoC7c3dB5l66GLsa vHYWB+Bj17Se+4d0oZQylkdAQS7e3a3nJPYJLUkES6CRKo+5AgLaECyD2+p3aHtRbMyh htEkZ8PLAqK91PGenD89FbiYBpC1LPDuWUSKxmiNDtyYZzN0/MZ6hqpfGgqywwlEG3PM Al6Q== X-Gm-Message-State: AMCzsaUS2g6pBoXu2D0E3EdC5LKZt7QS/7kN5Gr7W9CuJ0YVQTS5PBel DvLJDa7tUOeb7j9C+3d2QSKQUx3ZTT/c0WY+mD8= X-Received: by 10.107.178.81 with SMTP id b78mr19166437iof.235.1510057751640; Tue, 07 Nov 2017 04:29:11 -0800 (PST) MIME-Version: 1.0 Received: by 10.2.63.101 with HTTP; Tue, 7 Nov 2017 04:28:51 -0800 (PST) From: Carl Eugen Hoyos Date: Tue, 7 Nov 2017 13:28:51 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/tls_openssl: Fix compilation with current libressl X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch fixes compilation with current libressl, related to ticket #6801. Please comment, Carl Eugen From 9e660d1bbe0842264971f1e4e8c2539bdb36cd4c Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 7 Nov 2017 13:25:55 +0100 Subject: [PATCH] lavf/tls_openssl: Fix compilation with current libressl. Fixes a bug related to ticket #6801. --- libavformat/tls_openssl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index 1443e90..1e261d3 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -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; @@ -137,7 +137,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 @@ -147,7 +147,7 @@ static int tls_close(URLContext *h) 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); @@ -164,7 +164,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 @@ -212,7 +212,7 @@ static int url_bio_bputs(BIO *b, const char *str) 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", @@ -276,7 +276,7 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op 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); -- 1.7.10.4