From patchwork Tue Jun 11 14:16:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 13502 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1881D4475A7 for ; Tue, 11 Jun 2019 17:23:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE4BD680BAA; Tue, 11 Jun 2019 17:23:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f193.google.com (mail-it1-f193.google.com [209.85.166.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9DDA680347 for ; Tue, 11 Jun 2019 17:23:17 +0300 (EEST) Received: by mail-it1-f193.google.com with SMTP id j204so5018769ite.4 for ; Tue, 11 Jun 2019 07:23:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=s5YTRksYwv9m3eSr+HUNmSj34GZEZ0a1uJTTN7lyiKU=; b=Lq7QZ4K+VXlwhWH1RD0frtXueuFGAQ1OKpi6As4axbtwzBSHR7mxKN6JXrI8tIK0EW h+3LFBMbW11HhDiYds7iSJoBw9vtRbMlpqB0JgwRV0qnaHitps2kL5jUCHh6VFjq95mX Z2YQl0cl4okoH2mnG9Uvlrryjr0Be+L4H4p0DqfnhtrwJ3TE53IdYuLVbcKD0M0lYbHm 9sTkGQ8JAdFJtvJifBBLHsmr9Vwqh/omwRBak3Ytmw9b5Bdq9hKOfsE2IWZ8VCqQjoUd ck1sr7l2KdYo0NcyZcr1ydO9YY1eyrwZIo6qsB6ftFK6khbzfc8sM4P8j2dqHelXAvem KQ3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s5YTRksYwv9m3eSr+HUNmSj34GZEZ0a1uJTTN7lyiKU=; b=jx0p5SRTbEBUevkEgMBveG9MF2E3J1xHwcQN4OXWEa8cW4PGykjSy0O5zCQIKFantq fOhsaqmEc+72nG6X7w/RO0o+YcR4Ie/BDRnuSEjvVZZnMhVMDZmdBytZ6/C/n3IDLRgM Ne/sihhUYu180r/3+y51YYt1p0wploG72l99tLw6b4om2x9iCuiJFZQTdB+TGp0GVsrm lnPr2pkcrdU6hdBIlxLZ8rcWdDPSgh+Av+Rh/bGLZymzxRvasGC/TaUHX6OWq88fi0xX hz6o67KzAjB0rKwKdnZLgyCWIekNec7A1jdbm6ZwyUU4Krte5cE3Fq+m+rdg1Uz/bXz3 qDkA== X-Gm-Message-State: APjAAAWw1Ysu3MVHmqmR1EhwBCoicAHH44CwkcbWxoV1ZmFwGCivevOg o70aP8xEG2H5q++n4DE2F9ny5k4CoVk= X-Google-Smtp-Source: APXvYqx50JPQe40dAgFJlGzQn4uvaM/P/gf+bQ/ZDT7jbuZf2lNjQpoBy8hDQonAckjGwzCNNbzrIw== X-Received: by 2002:a24:f807:: with SMTP id a7mr19526456ith.166.1560262593537; Tue, 11 Jun 2019 07:16:33 -0700 (PDT) Received: from Rodgers-MBP.localdomain ([71.201.155.37]) by smtp.gmail.com with ESMTPSA id w23sm5005046ioa.51.2019.06.11.07.16.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Jun 2019 07:16:32 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Jun 2019 09:16:19 -0500 Message-Id: <20190611141623.59440-2-rodger.combs@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190611141623.59440-1-rodger.combs@gmail.com> References: <20190611141623.59440-1-rodger.combs@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/6] lavf/tls_apple: factor loading SecItemIdentity into its own (Mac-only) function 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" This allows us to easily reuse this function with NWF --- libavformat/tls_apple.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/libavformat/tls_apple.c b/libavformat/tls_apple.c index 37380541b1..2ff6622565 100644 --- a/libavformat/tls_apple.c +++ b/libavformat/tls_apple.c @@ -150,28 +150,46 @@ end: return ret; } -static int load_cert(URLContext *h) +static int load_identity(URLContext *h, SecIdentityRef *identity, CFArrayRef *certArray) { +#if !HAVE_SECITEMIMPORT + return AVERROR_PATCHWELCOME; +#else TLSContext *c = h->priv_data; int ret = 0; - CFArrayRef certArray = NULL; CFArrayRef keyArray = NULL; - SecIdentityRef id = NULL; - CFMutableArrayRef outArray = NULL; - if ((ret = import_pem(h, c->tls_shared.cert_file, &certArray)) < 0) + if ((ret = import_pem(h, c->tls_shared.cert_file, certArray)) < 0) goto end; if ((ret = import_pem(h, c->tls_shared.key_file, &keyArray)) < 0) goto end; - if (!(id = SecIdentityCreate(kCFAllocatorDefault, - (SecCertificateRef)CFArrayGetValueAtIndex(certArray, 0), + if (!(*identity = SecIdentityCreate(kCFAllocatorDefault, + (SecCertificateRef)CFArrayGetValueAtIndex(*certArray, 0), (SecKeyRef)CFArrayGetValueAtIndex(keyArray, 0)))) { ret = AVERROR_UNKNOWN; goto end; } +end: + if (keyArray) + CFRelease(keyArray); + return ret; +#endif +} + +static int load_cert(URLContext *h) +{ + TLSContext *c = h->priv_data; + int ret = 0; + SecIdentityRef id = NULL; + CFArrayRef certArray = NULL; + CFMutableArrayRef outArray = NULL; + + if ((ret = load_identity(h, &id, &certArray)) < 0) + goto end; + if (!(outArray = CFArrayCreateMutableCopy(kCFAllocatorDefault, 0, certArray))) { ret = AVERROR(ENOMEM); goto end; @@ -184,8 +202,6 @@ static int load_cert(URLContext *h) end: if (certArray) CFRelease(certArray); - if (keyArray) - CFRelease(keyArray); if (outArray) CFRelease(outArray); if (id)