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>,
	rjones@redhat.com, stefanha@redhat.com
Subject: [Qemu-devel] [PATCH v7 10/13] curl: introduce ssl_no_cert runtime option.
Date: Thu,  6 Jun 2013 14:25:56 +0800	[thread overview]
Message-ID: <1370499959-8916-11-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1370499959-8916-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 6e893d0..e067417 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);
@@ -339,6 +341,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
@@ -429,7 +433,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 */ }
     },
 };
 
@@ -467,6 +476,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.3

  parent reply	other threads:[~2013-06-06  6:27 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-06  6:25 [Qemu-devel] [PATCH v7 00/13] curl: fix curl read Fam Zheng
2013-06-06  6:25 ` [Qemu-devel] [PATCH v7 01/13] curl: introduce CURLSockInfo to BDRVCURLState Fam Zheng
2013-06-06  6:25 ` [Qemu-devel] [PATCH v7 02/13] curl: change magic number to sizeof Fam Zheng
2013-06-06  6:25 ` [Qemu-devel] [PATCH v7 03/13] curl: change curl_multi_do to curl_fd_handler Fam Zheng
2013-06-06  6:25 ` [Qemu-devel] [PATCH v7 04/13] curl: fix curl_open Fam Zheng
2013-06-06  6:25 ` [Qemu-devel] [PATCH v7 05/13] curl: add timer to BDRVCURLState Fam Zheng
2013-06-06  6:25 ` [Qemu-devel] [PATCH v7 06/13] curl: introduce CURLDataCache Fam Zheng
2013-06-06  6:25 ` [Qemu-devel] [PATCH v7 07/13] curl: make use of CURLDataCache Fam Zheng
2013-06-06  6:25 ` [Qemu-devel] [PATCH v7 08/13] curl: use list to store CURLState Fam Zheng
2013-06-06  6:25 ` [Qemu-devel] [PATCH v7 09/13] curl: add cache quota Fam Zheng
2013-06-06  6:25 ` Fam Zheng [this message]
2013-06-06  6:25 ` [Qemu-devel] [PATCH v7 11/13] block/curl.c: Refuse to open the handle for writes Fam Zheng
2013-06-06  6:25 ` [Qemu-devel] [PATCH v7 12/13] curl: set s->url to NULL after free Fam Zheng
2013-06-06  6:25 ` [Qemu-devel] [PATCH v7 13/13] curl: change timeout to 30 seconds Fam Zheng
2013-06-06 11:01 ` [Qemu-devel] [PATCH v7 00/13] curl: fix curl read Richard W.M. Jones
2013-06-07  1:54   ` Fam Zheng
2013-06-07  7:27     ` Richard W.M. Jones
2013-06-07  7:47       ` Fam Zheng
2013-06-07  9:41         ` Richard W.M. Jones
2013-06-07  7:46   ` Stefan Hajnoczi
2013-06-07  7:53     ` Fam Zheng

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=1370499959-8916-11-git-send-email-famz@redhat.com \
    --to=famz@redhat.com \
    --cc=jcody@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rjones@redhat.com \
    --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).