From patchwork Thu Feb 25 08:41:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 46225 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 02D25B7C59 for ; Thu, 25 Feb 2010 20:02:30 +1100 (EST) Received: from localhost ([127.0.0.1]:36419 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkZbJ-0006La-3S for incoming@patchwork.ozlabs.org; Thu, 25 Feb 2010 04:01:41 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NkZHw-0006aB-Pn for qemu-devel@nongnu.org; Thu, 25 Feb 2010 03:41:41 -0500 Received: from [199.232.76.173] (port=52749 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkZHw-0006Zf-5F for qemu-devel@nongnu.org; Thu, 25 Feb 2010 03:41:40 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NkZHu-0007gA-WC for qemu-devel@nongnu.org; Thu, 25 Feb 2010 03:41:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36998) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NkZHu-0007g4-KK for qemu-devel@nongnu.org; Thu, 25 Feb 2010 03:41:38 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o1P8fbLb003280 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 25 Feb 2010 03:41:37 -0500 Received: from zweiblum.home.kraxel.org (vpn1-7-164.ams2.redhat.com [10.36.7.164]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o1P8faDT011608; Thu, 25 Feb 2010 03:41:37 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 438517010F; Thu, 25 Feb 2010 09:41:36 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 25 Feb 2010 09:41:36 +0100 Message-Id: <1267087296-15667-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH] move x509 file name defines to qemu-x509.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Want share them with vnc and spice. Signed-off-by: Gerd Hoffmann Reviewed-by: Juan Quintela --- qemu-x509.h | 9 +++++++++ vnc-tls.c | 7 +------ 2 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 qemu-x509.h diff --git a/qemu-x509.h b/qemu-x509.h new file mode 100644 index 0000000..095aec1 --- /dev/null +++ b/qemu-x509.h @@ -0,0 +1,9 @@ +#ifndef QEMU_X509_H +#define QEMU_X509_H + +#define X509_CA_CERT_FILE "ca-cert.pem" +#define X509_CA_CRL_FILE "ca-crl.pem" +#define X509_SERVER_KEY_FILE "server-key.pem" +#define X509_SERVER_CERT_FILE "server-cert.pem" + +#endif /* QEMU_X509_H */ diff --git a/vnc-tls.c b/vnc-tls.c index e0a27ad..dec626c 100644 --- a/vnc-tls.c +++ b/vnc-tls.c @@ -24,6 +24,7 @@ * THE SOFTWARE. */ +#include "qemu-x509.h" #include "vnc.h" #include "qemu_socket.h" @@ -419,12 +420,6 @@ static int vnc_set_x509_credential(VncDisplay *vd, } -#define X509_CA_CERT_FILE "ca-cert.pem" -#define X509_CA_CRL_FILE "ca-crl.pem" -#define X509_SERVER_KEY_FILE "server-key.pem" -#define X509_SERVER_CERT_FILE "server-cert.pem" - - int vnc_tls_set_x509_creds_dir(VncDisplay *vd, const char *certdir) {