qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, jcody@redhat.com, Fam Zheng <famz@redhat.com>,
	stefanha@redhat.com
Subject: [Qemu-devel] [PATCH v2 11/11] curl: introduce ssl_no_cert runtime option.
Date: Tue, 14 May 2013 10:26:30 +0800	[thread overview]
Message-ID: <1368498390-20738-12-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1368498390-20738-1-git-send-email-famz@redhat.com>

Added an option to let curl disable ssl certificate check.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 block/curl.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/block/curl.c b/block/curl.c
index fa9960d..21a357b 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -96,6 +96,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);
@@ -337,6 +339,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
@@ -427,7 +431,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 */ }
     },
 };
 
@@ -465,6 +474,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;
-- 
1.8.1.4

  parent reply	other threads:[~2013-05-14  2:27 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-14  2:26 [Qemu-devel] [PATCH v2 00/11] curl: fix curl read Fam Zheng
2013-05-14  2:26 ` [Qemu-devel] [PATCH v2 01/11] curl: introduce CURLSockInfo to BDRVCURLState Fam Zheng
2013-05-14  7:59   ` Stefan Hajnoczi
2013-05-14  2:26 ` [Qemu-devel] [PATCH v2 02/11] curl: change magic number to macro Fam Zheng
2013-05-14  8:04   ` Stefan Hajnoczi
2013-05-14  2:26 ` [Qemu-devel] [PATCH v2 03/11] curl: change curl_multi_do to curl_fd_handler Fam Zheng
2013-05-14  2:26 ` [Qemu-devel] [PATCH v2 04/11] curl: fix curl_open Fam Zheng
2013-05-14  8:13   ` Stefan Hajnoczi
2013-05-14  2:26 ` [Qemu-devel] [PATCH v2 05/11] curl: add timer to BDRVCURLState Fam Zheng
2013-05-14  2:26 ` [Qemu-devel] [PATCH v2 06/11] curl: introduce CURLDataCache Fam Zheng
2013-05-14  2:26 ` [Qemu-devel] [PATCH v2 07/11] curl: make use of CURLDataCache Fam Zheng
2013-05-14  2:26 ` [Qemu-devel] [PATCH v2 08/11] curl: use list to store CURLState Fam Zheng
2013-05-14  2:26 ` [Qemu-devel] [PATCH v2 09/11] curl: release everything on curl_close Fam Zheng
2013-05-14  8:20   ` Stefan Hajnoczi
2013-05-14  2:26 ` [Qemu-devel] [PATCH v2 10/11] curl: add cache quota Fam Zheng
2013-05-14  2:26 ` Fam Zheng [this message]
2013-05-14  8:22 ` [Qemu-devel] [PATCH v2 00/11] curl: fix curl read Stefan Hajnoczi
2013-05-14  8:50   ` Fam Zheng
2013-05-15  3:46   ` Fam Zheng
2013-05-15  7:56     ` Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1368498390-20738-12-git-send-email-famz@redhat.com \
    --to=famz@redhat.com \
    --cc=jcody@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).