summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2010-02-25 09:41:36 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2010-03-08 11:30:09 -0600
commitde7890db9ed3baa07d3fcdd4beef1bdfc430ac2b (patch)
treef67dfc0c22798821898a25f7595e186129843297
parentcf602c7bf0fc4e9e183fbb2103dce1624b2bb7dc (diff)
downloadqemu-de7890db9ed3baa07d3fcdd4beef1bdfc430ac2b.tar.gz
move x509 file name defines to qemu-x509.h
Want share them with vnc and spice. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--qemu-x509.h9
-rw-r--r--vnc-tls.c7
2 files changed, 10 insertions, 6 deletions
diff --git a/qemu-x509.h b/qemu-x509.h
new file mode 100644
index 0000000000..095aec161d
--- /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 e0a27ad036..dec626c539 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)
{