From patchwork Mon May 20 07:03:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 244856 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4CC892C00A1 for ; Mon, 20 May 2013 17:06:22 +1000 (EST) Received: from localhost ([::1]:41450 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UeKAm-00015l-CK for incoming@patchwork.ozlabs.org; Mon, 20 May 2013 03:06:20 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UeK8w-00072W-N1 for qemu-devel@nongnu.org; Mon, 20 May 2013 03:04:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UeK8t-0003n6-Vk for qemu-devel@nongnu.org; Mon, 20 May 2013 03:04:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26039) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UeK8t-0003mn-M6 for qemu-devel@nongnu.org; Mon, 20 May 2013 03:04:23 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r4K74Meh023535 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 20 May 2013 03:04:22 -0400 Received: from fam-laptop.nay.redhat.com ([10.66.7.14]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r4K73nLn026470; Mon, 20 May 2013 03:04:19 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Mon, 20 May 2013 15:03:44 +0800 Message-Id: <1369033424-14594-11-git-send-email-famz@redhat.com> In-Reply-To: <1369033424-14594-1-git-send-email-famz@redhat.com> References: <1369033424-14594-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, jcody@redhat.com, Fam Zheng , stefanha@redhat.com Subject: [Qemu-devel] [PATCH v3 10/10] curl: introduce ssl_no_cert runtime option. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Added an option to let curl disable ssl certificate check. Signed-off-by: Fam Zheng --- block/curl.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/block/curl.c b/block/curl.c index f4e2571..9352c6c 100644 --- a/block/curl.c +++ b/block/curl.c @@ -95,6 +95,8 @@ typedef struct BDRVCURLState { int cache_quota; /* Whether http server accept range in header */ bool accept_range; + /* Whether certificated ssl only */ + bool ssl_no_cert; } BDRVCURLState; static void curl_clean_state(CURLState *s); @@ -336,6 +338,8 @@ static CURLState *curl_init_state(BDRVCURLState *s) curl_easy_setopt(state->curl, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(state->curl, CURLOPT_ERRORBUFFER, state->errmsg); curl_easy_setopt(state->curl, CURLOPT_FAILONERROR, 1); + curl_easy_setopt(state->curl, CURLOPT_SSL_VERIFYPEER, + s->ssl_no_cert ? 0 : 1); /* Restrict supported protocols to avoid security issues in the more * obscure protocols. For example, do not allow POP3/SMTP/IMAP see @@ -426,7 +430,12 @@ static QemuOptsList runtime_opts = { .type = QEMU_OPT_SIZE, .help = "Readahead size", }, - { /* end of list */ } + { + .name = "ssl_no_cert", + .type = QEMU_OPT_BOOL, + .help = "SSL certificate check", + }, + { /* End of list */ } }, }; @@ -464,6 +473,7 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags) goto out_noclean; } + s->ssl_no_cert = qemu_opt_get_bool(opts, "ssl_no_cert", true); if (!inited) { curl_global_init(CURL_GLOBAL_ALL); inited = 1;