[Qemu-devel] Re: [PATCH] move x509 file name defines to qemu-x509.h

[Juan Quintela]

Gerd Hoffmann <address@hidden> wrote:
> Want share them with vnc and spice.

Reviewed-by: Juan Quintela <address@hidden>

> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---
>  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)
>  {