From patchwork Sun Oct 9 15:39:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Oliver X-Patchwork-Id: 927 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp2102384vsd; Sun, 9 Oct 2016 08:45:42 -0700 (PDT) X-Received: by 10.194.139.236 with SMTP id rb12mr24284588wjb.101.1476027942467; Sun, 09 Oct 2016 08:45:42 -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 yr3si32179096wjc.112.2016.10.09.08.45.41; Sun, 09 Oct 2016 08:45:42 -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 A0E15689AD8; Sun, 9 Oct 2016 18:45:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f52.google.com (mail-it0-f52.google.com [209.85.214.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94556689730 for ; Sun, 9 Oct 2016 18:45:16 +0300 (EEST) Received: by mail-it0-f52.google.com with SMTP id o21so53282309itb.0 for ; Sun, 09 Oct 2016 08:45:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to; bh=MmYhX9p6SKvByeV4AD6pGmqaPCxl3/s1h+ckJUprqn0=; b=EacGWFpJ6e/1Mcekve77Sjk7NEaOo0B/hp1N2KD0Ee0EAGNtNakR3EvFn4/N5uB9xE gv6ueQHRsbTf+r7z+y7bgeVzlrv8sxbit49+DOS71dtm0IFsRGj1yeaRAyzLVKNlb79J GKTbHuyCUQjeH/I/bmM2EsaHPQzvhs+QIwpdNcp0b9lqzlWqBk/ktNTq3tXeC6PDHVEo pY4f1Kg2C2lSC87j27CibzUEY9sS7Q3asSHcbwdmFiZ4gjMirJnIy7AdnOD8vpCqGEKJ eb/9DCyx1LBszqF23xAM0nkBnqw3e30mLKFBnNgrjA9pSND6b7rbQPWxmCpcVRWMtDtW jMDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=MmYhX9p6SKvByeV4AD6pGmqaPCxl3/s1h+ckJUprqn0=; b=i7xfLuujS1YHmPuT6APcSLzY7RIn4SCkHJTQOP/3Ufyl2T35WTd1KCVamoihqqavzp SWWuGc8eNXwuXmy76bmOyv9hW/JkXWswmzhVdRli23i965ZVnPgZa8YerQLx6L89AEEu WNu6wrp2nsW+Dwtxbyj1H9jOadr0Nau+S2Z7p/nwG516s96YYr7vuSHEB1qsKx2Ymx73 D0qHsq3uQi8UkgVzVWrApErCf0uysFYm9zmDdq/3HpBehw3hmYCHAmH/1MZqQ0Pjle34 uI5WTGa1o8/p9iAjoyxMJI0YpnSD8rscoeJd53OJsmo4S5Vlkng8FhNwTnBbz+GV7uiS 38jQ== X-Gm-Message-State: AA6/9RkyH8XGBN2D5cXq+MOcCImpj58LRBHL0fTLWM5qnSgHgwY5CmskI2OByZ3jYNTUIDrTwyRsX5tz+w0CPw== X-Received: by 10.36.224.137 with SMTP id c131mr6203669ith.10.1476027592070; Sun, 09 Oct 2016 08:39:52 -0700 (PDT) MIME-Version: 1.0 Received: by 10.36.111.18 with HTTP; Sun, 9 Oct 2016 08:39:51 -0700 (PDT) From: Matt Oliver Date: Mon, 10 Oct 2016 02:39:51 +1100 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [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 | 159 ++++++++++++++++++++++++++++------------------ 2 files changed, 98 insertions(+), 64 deletions(-) avpriv_unlock_avformat(); @@ -107,6 +195,9 @@ void ff_openssl_deinit(void) av_free(openssl_mutexes); } #endif +#if OPENSSL_VERSION_NUMBER >= 0x1010000fL + BIO_meth_free(url_bio_method); +#endif } avpriv_unlock_avformat(); } @@ -132,69 +223,6 @@ static int tls_close(URLContext *h) 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) { TLSContext *p = h->priv_data; @@ -240,8 +268,13 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op ret = AVERROR(EIO); goto fail; } +#if OPENSSL_VERSION_NUMBER >= 0x1010000fL + bio = BIO_new(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 df6ffa2..750684a 100755 --- a/configure +++ b/configure @@ -5813,7 +5813,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..4effb39 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -63,6 +63,85 @@ 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); +#else +#define BIO_GET_DATA(x) x->ptr; +#endif + +static int url_bio_bread(BIO *b, char *buf, int len) +{ + URLContext *h = BIO_GET_DATA(b); + 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 = BIO_GET_DATA(b); + 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)); +} + +#if OPENSSL_VERSION_NUMBER >= 0x1010000fL +static BIO_METHOD* url_bio_method; +#else +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(); @@ -86,6 +165,15 @@ int ff_openssl_init(void) #endif } #endif +#if OPENSSL_VERSION_NUMBER >= 0x1010000fL + url_bio_method = BIO_meth_new(BIO_TYPE_SOURCE_SINK, "urlprotocol bio"); + BIO_meth_set_write(url_bio_method, url_bio_bwrite); + BIO_meth_set_read(url_bio_method, url_bio_bread); + BIO_meth_set_puts(url_bio_method, url_bio_bputs); + BIO_meth_set_ctrl(url_bio_method, url_bio_ctrl); + BIO_meth_set_create(url_bio_method, url_bio_create); + BIO_meth_set_destroy(url_bio_method, url_bio_destroy); +#endif } openssl_init++;