From patchwork Sat Oct 15 03:22:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Oliver X-Patchwork-Id: 1008 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp144754vsd; Fri, 14 Oct 2016 20:28:44 -0700 (PDT) X-Received: by 10.28.91.149 with SMTP id p143mr402902wmb.20.1476502124088; Fri, 14 Oct 2016 20:28:44 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id al2si27899521wjd.196.2016.10.14.20.28.43; Fri, 14 Oct 2016 20:28:44 -0700 (PDT) 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; 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 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 D20FD689AA6; Sat, 15 Oct 2016 06:28:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f42.google.com (mail-it0-f42.google.com [209.85.214.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74F9E680CC0 for ; Sat, 15 Oct 2016 06:28:32 +0300 (EEST) Received: by mail-it0-f42.google.com with SMTP id m138so7384652itm.0 for ; Fri, 14 Oct 2016 20:28:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=nRaxEjr9QQmzpwa9j6h0NfQpMipKRz9BBCpLEvzDAEk=; b=s2H57kYKp7rCet7TYWchOjkZpCQWgU0+UUkoiRTmA7Eq3KXm+GGpykErTsadLc8VhN BYs4VW2t8vBZw7mh9bSWhds8ETN2v8ya6Q5r9FHRDdVeRYb106OiU3GXsFUk+3rEjXdk Wn9MgKAvPVU8bxFT7/tJepcABdh83YAsRFkJE/MDUDNHK6/wiQwylgnEIao9zzolhTmE RPyS7pBmZahEh/sMvnJAMej+5ojZFbjGHfliSgWTcq2L2kGTVtFGfBWAPDq8Br6AzPcQ DiVeYu59pVC8YsT/UtVZTMtyBAIkctG7D9HIZfWJLYbv2XA1dIefwJ3X2tCJMG+4aJfC 5GCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=nRaxEjr9QQmzpwa9j6h0NfQpMipKRz9BBCpLEvzDAEk=; b=dKr0Wqje1C/KHO8HrcoziXoeqzUQc2D8qZCtIw3STu11G/pgLFmfztStr7iRuH7mD3 hL54bnEwWyBh37Otu2x7BxWqVSCMrHQxJDfWYRJtipCbj2LJTxHS6B4eS4IhHIGCCxup mYCYkEuqa3H30HnGDwe1d7EqC6ggL3hztEXM2OT2EJxPvb9i5b5APtLs5Q67avu8xZJm K9x2MM/JizK19/a1tgVy+vw9Dm1Rb51vG5x0FAE33e/YZpEKZpnIiwfzSeCY4Or+2BHN iJRafiSH0edqw+UeVnJf+siUd4EG4eNGanqyVjLqzSnvPNw69n5jF/loiexvzKrixfmj Leyg== X-Gm-Message-State: AA6/9RnDCG7gAOFUUQd0vrcdJMHxpzQ2cmD3HAUTMuLhZWfh7L/soFLb1JDGRnMu3zt9IpUtMjY6kjwEeTa2ZQ== X-Received: by 10.36.69.232 with SMTP id c101mr384875itd.14.1476501723521; Fri, 14 Oct 2016 20:22:03 -0700 (PDT) MIME-Version: 1.0 Received: by 10.36.111.18 with HTTP; Fri, 14 Oct 2016 20:22:02 -0700 (PDT) In-Reply-To: References: <20161014060450.09ea5234@googlemail.com> From: Matt Oliver Date: Sat, 15 Oct 2016 14:22:02 +1100 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH] openssl: Support version 1.1.0. 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" --- configure | 3 +- libavformat/tls_openssl.c | 163 ++++++++++++++++++++++++++++------------------ 2 files changed, 102 insertions(+), 64 deletions(-) TLSContext *p = h->priv_data; @@ -240,8 +265,20 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op ret = AVERROR(EIO); goto fail; } +#if OPENSSL_VERSION_NUMBER >= 0x1010000fL + 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); + BIO_meth_set_puts(p->url_bio_method, url_bio_bputs); + BIO_meth_set_ctrl(p->url_bio_method, url_bio_ctrl); + BIO_meth_set_create(p->url_bio_method, url_bio_create); + BIO_meth_set_destroy(p->url_bio_method, url_bio_destroy); + bio = BIO_new(p->url_bio_method); + BIO_set_data(bio, c->tcp); +#else bio = BIO_new(&url_bio_method); bio->ptr = c->tcp; +#endif SSL_set_bio(p->ssl, bio, bio); if (!c->listen && !c->numerichost) SSL_set_tlsext_host_name(p->ssl, c->host); 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..c551ac7 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -43,6 +43,9 @@ typedef struct TLSContext { TLSShared tls_shared; SSL_CTX *ctx; SSL *ssl; +#if OPENSSL_VERSION_NUMBER >= 0x1010000fL + BIO_METHOD* url_bio_method; +#endif } TLSContext; #if HAVE_THREADS @@ -63,6 +66,87 @@ 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 GET_BIO_DATA(x) BIO_get_data(x); +#else +#define GET_BIO_DATA(x) (x)->ptr; +#endif + +static int url_bio_bread(BIO *b, char *buf, int len) +{ + URLContext *h; + int ret; + h = GET_BIO_DATA(b); + ret = ffurl_read(h, buf, len); + if (ret >= 0) + return ret; + BIO_clear_retry_flags(b); + if (ret == AVERROR_EXIT) + return 0; + return -1; +} + +static int url_bio_bwrite(BIO *b, const char *buf, int len) +{ + URLContext *h; + int ret; + h = GET_BIO_DATA(b); + ret = ffurl_write(h, buf, len); + if (ret >= 0) + return ret; + BIO_clear_retry_flags(b); + if (ret == AVERROR_EXIT) + return 0; + return -1; +} + +static long url_bio_ctrl(BIO *b, int cmd, long num, void *ptr) +{ + if (cmd == BIO_CTRL_FLUSH) { + BIO_clear_retry_flags(b); + return 1; + } + return 0; +} + +static int url_bio_bputs(BIO *b, const char *str) +{ + return url_bio_bwrite(b, str, strlen(str)); +} + +#if OPENSSL_VERSION_NUMBER < 0x1010000fL +static BIO_METHOD url_bio_method = { + .type = BIO_TYPE_SOURCE_SINK, + .name = "urlprotocol bio", + .bwrite = url_bio_bwrite, + .bread = url_bio_bread, + .bputs = url_bio_bputs, + .bgets = NULL, + .ctrl = url_bio_ctrl, + .create = url_bio_create, + .destroy = url_bio_destroy, +}; +#endif + int ff_openssl_init(void) { avpriv_lock_avformat(); @@ -128,73 +212,14 @@ 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 (c->url_bio_method) + BIO_meth_free(c->url_bio_method); +#endif ff_openssl_deinit(); return 0; } -static int url_bio_create(BIO *b) -{ - b->init = 1; - b->ptr = NULL; - b->flags = 0; - return 1; -} - -static int url_bio_destroy(BIO *b) -{ - return 1; -} - -static int url_bio_bread(BIO *b, char *buf, int len) -{ - URLContext *h = b->ptr; - int ret = ffurl_read(h, buf, len); - if (ret >= 0) - return ret; - BIO_clear_retry_flags(b); - if (ret == AVERROR_EXIT) - return 0; - return -1; -} - -static int url_bio_bwrite(BIO *b, const char *buf, int len) -{ - URLContext *h = b->ptr; - int ret = ffurl_write(h, buf, len); - if (ret >= 0) - return ret; - BIO_clear_retry_flags(b); - if (ret == AVERROR_EXIT) - return 0; - return -1; -} - -static long url_bio_ctrl(BIO *b, int cmd, long num, void *ptr) -{ - if (cmd == BIO_CTRL_FLUSH) { - BIO_clear_retry_flags(b); - return 1; - } - return 0; -} - -static int url_bio_bputs(BIO *b, const char *str) -{ - return url_bio_bwrite(b, str, strlen(str)); -} - -static BIO_METHOD url_bio_method = { - .type = BIO_TYPE_SOURCE_SINK, - .name = "urlprotocol bio", - .bwrite = url_bio_bwrite, - .bread = url_bio_bread, - .bputs = url_bio_bputs, - .bgets = NULL, - .ctrl = url_bio_ctrl, - .create = url_bio_create, - .destroy = url_bio_destroy, -}; - static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **options) {