From patchwork Wed Oct 25 18:15:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 5689 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp2121955jah; Wed, 25 Oct 2017 11:23:08 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TBybXsyFBJRAmAGVHnFU7Cb4BHZCsGYqz7dg+a/ZXuX7l9qMBrUaAZiUsqoza2cgPdmRTJ X-Received: by 10.223.174.142 with SMTP id y14mr2826915wrc.222.1508955788885; Wed, 25 Oct 2017 11:23:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508955788; cv=none; d=google.com; s=arc-20160816; b=g6zePCtPR33dqO0+2FXbqIEXpL+91jRq5fzwhw7SK8Xi2R9U/ru+/53LWvZErMU27f OpnWJv6rRGVm/yadiffeiSj+rWczCYWtfJLYjBZRahkB9GV2Lg1nDM9FthyRyR8aovJQ Iux137gx6pkqOXo7JuJrWPlWBA1zQTMJ1KgJwyzGz5rm6gHMQ/tTf+tyELOwgn0eJh9b w1NUbnXRMHGscfhYTi7+ckvyhBF/L0H2y3Ece4qVPj39na9dhdTyDPtxNCz11+XjUd9A 29MSSt6N7np4Or3L1nwkvCxC6SNnyc2D9oP568S3A6xISL5/rhUgiQ3mcYjyHgX7fdP0 IAIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=PeMoFprpC9YRZP8wcmZ/J8lMZFt+z6Ig2txoYW26g8Y=; b=vpQplIFS8ZVpmIt/hxWisFkEzrOIRkWU4gfC9Zhh2VLPwuM9hkk9d5TjK4nfkKZhQF bsBe+wPLsIZqxxCx6+51ZxdZkGYE//Q99O/h6LFTybxMNQR+/UEkzFKerGKyOy97CTMJ 2Fc9pkYnsV6qwTn6xpYd6UVT7mIXGXxa0oa1aJ4sl3TSeOhucNSxaxjj+nTeU37g3rXc kAKb5vqImvwGE4sZuCy/PF0WX3zvOyzAAnRbXxkbYTcmLzr4ElQXVxkqE0bysSkJgMGQ wqwSuQmuZwb4J2zNnlGBdDqS9QnW0ASrKAMkA8xIsRZfHIan5pZoGITut+ldNGUSCnnJ P0hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=E7Vp1vzF; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k6si2267789wme.199.2017.10.25.11.23.07; Wed, 25 Oct 2017 11:23:08 -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=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=E7Vp1vzF; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E1CEC68A493; Wed, 25 Oct 2017 21:22:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1DB768A415 for ; Wed, 25 Oct 2017 21:22:52 +0300 (EEST) Received: by mail-pf0-f196.google.com with SMTP id p87so579853pfj.3 for ; Wed, 25 Oct 2017 11:23:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=pzGbcuxB3tyqzQu+8XuJSRyOcwiKrIrLXv9E8J3mEa0=; b=E7Vp1vzFjMBfeTUQStSMqyCK6mMYn+xF2SvSHQiPQBRDw5O8v8zmJ8VgE7nVOxTyNX Bsb7TKooZ/MnEaRVr38dF4Wg/2yzy5+pKqPUZqE01gP9eQwecX/Q8giPwR9G02fl5C+z ihlZ1sS3VJCgpql14xRBWFBtjCh2ZVX1B41DX/cQ00TJlTSYU1CMyKkeZRzuikNOM2aN MNxCy76byF9xzH5Psf4EBe5+eB1s+b+bks56ZcBu4+0GfAhW86isQboHcaqZFlapGbmA teWaTiC3QPu1QV6s4Mj3mgAZIa/cYjKcUGL4K5ejPYwICbLZ0oJO2NLGaCDwSSYwaZMT kBaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=pzGbcuxB3tyqzQu+8XuJSRyOcwiKrIrLXv9E8J3mEa0=; b=J16Oo3LLt3wmuwlgdd72UGQlORdMqqy5G9+uHAj7VDc+WENxVD0fSVANSfVVcYJ9E7 lk+B6Hf5/Kth10SePcXStP/Pnb0DZENTFrqRUCD94LNm66wkKbr6p9NaNjh+VFCTtmwU Yvp3mw1Sp4I52UjQw/jIGANm17o2b3JeCTn8lQR1SLwh/HhdkeDMr5Fkg7BmK3zu9pwL 6Xsyjbj05R/qBUcyZsE126dFLHrhTRuucLeYiiNmjbc0N1EDmjXAYtfv2hJvvY9uqle5 oIvuxzRdEUSSPoWLTWxwco/NYdEbPRJwqr6tOxOdIh81oH7quWj6l/44QI4BhvtvoPm1 WLNg== X-Gm-Message-State: AMCzsaXyAP+hMSxxQIgbHiuuMMcyR240Tdzsk/MKCCrp0Ul8cTIZIKgq n7Alw7ny2TDAmqiOOrp39V4pF+Dj X-Received: by 10.99.189.65 with SMTP id d1mr2793424pgp.48.1508955317649; Wed, 25 Oct 2017 11:15:17 -0700 (PDT) Received: from tmm1-imac.local.net (c-73-252-174-83.hsd1.ca.comcast.net. [73.252.174.83]) by smtp.gmail.com with ESMTPSA id i129sm5918698pgd.21.2017.10.25.11.15.16 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 25 Oct 2017 11:15:17 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Oct 2017 11:15:00 -0700 Message-Id: <20171025181500.6261-2-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171025181500.6261-1-ffmpeg@tmm1.net> References: <20171025181500.6261-1-ffmpeg@tmm1.net> Subject: [FFmpeg-devel] [PATCH 2/2] lavf/tls_securetransport: build on iOS 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 Cc: Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta This works as expected on iOS, except for the ca_file feature which is disabled because SecItemImport is not available. --- configure | 6 +++++- libavformat/tls_securetransport.c | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure b/configure index c86e5788fa..a867077d66 100755 --- a/configure +++ b/configure @@ -2039,6 +2039,7 @@ SYSTEM_FUNCS=" posix_memalign pthread_cancel sched_getaffinity + SecItemImport SetConsoleTextAttribute SetConsoleCtrlHandler setmode @@ -6164,9 +6165,12 @@ fi enabled securetransport && check_func SecIdentityCreate "-Wl,-framework,CoreFoundation -Wl,-framework,Security" && - check_lib securetransport "Security/SecureTransport.h Security/Security.h" "SSLCreateContext SecItemImport" "-Wl,-framework,CoreFoundation -Wl,-framework,Security" || + check_lib securetransport "Security/SecureTransport.h Security/Security.h" "SSLCreateContext" "-Wl,-framework,CoreFoundation -Wl,-framework,Security" || disable securetransport +enabled securetransport && + check_func SecItemImport "-Wl,-framework,CoreFoundation -Wl,-framework,Security" + enabled schannel && check_func_headers "windows.h security.h" InitializeSecurityContext -DSECURITY_WIN32 -lsecur32 && check_cpp_condition winerror.h "defined(SEC_I_CONTEXT_EXPIRED)" && diff --git a/libavformat/tls_securetransport.c b/libavformat/tls_securetransport.c index 9ea588ae3a..69672f7676 100644 --- a/libavformat/tls_securetransport.c +++ b/libavformat/tls_securetransport.c @@ -69,6 +69,9 @@ static int print_tls_error(URLContext *h, int ret) static int import_pem(URLContext *h, char *path, CFArrayRef *array) { +#if !HAVE_SECITEMIMPORT + return AVERROR_PATCHWELCOME; +#else AVIOContext *s = NULL; CFDataRef data = NULL; int64_t ret = 0; @@ -124,6 +127,7 @@ end: if (s) avio_close(s); return ret; +#endif } static int load_ca(URLContext *h)