From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Np0Wp-0006o7-HE
	for qemu-devel@nongnu.org; Tue, 09 Mar 2010 09:35:23 -0500
Received: from [199.232.76.173] (port=44126 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Np0Wo-0006mN-F3
	for qemu-devel@nongnu.org; Tue, 09 Mar 2010 09:35:22 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <anthony@codemonkey.ws>) id 1Np0Mh-0006rB-7s
	for qemu-devel@nongnu.org; Tue, 09 Mar 2010 09:24:56 -0500
Received: from mail-qy0-f190.google.com ([209.85.221.190]:60216)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1Np0Mh-0006pt-0A
	for qemu-devel@nongnu.org; Tue, 09 Mar 2010 09:24:55 -0500
Received: by mail-qy0-f190.google.com with SMTP id 28so7483775qyk.14
	for <qemu-devel@nongnu.org>; Tue, 09 Mar 2010 06:24:54 -0800 (PST)
Message-ID: <4B965A31.9040502@codemonkey.ws>
Date: Tue, 09 Mar 2010 08:24:49 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH] move x509 file name defines to qemu-x509.h
References: <1267087296-15667-1-git-send-email-kraxel@redhat.com>
In-Reply-To: <1267087296-15667-1-git-send-email-kraxel@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-devel@nongnu.org

On 02/25/2010 02:41 AM, Gerd Hoffmann wrote:
> Want share them with vnc and spice.
>
> Signed-off-by: Gerd Hoffmann<kraxel@redhat.com>
>    

Applied.  Thanks.

Regards,

Anthony Liguori
> ---
>   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)
>   {
>