2
0
Эх сурвалжийг харах

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>
Gerd Hoffmann 15 жил өмнө
parent
commit
de7890db9e
2 өөрчлөгдсөн 10 нэмэгдсэн , 6 устгасан
  1. 9 0
      qemu-x509.h
  2. 1 6
      vnc-tls.c

+ 9 - 0
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 */

+ 1 - 6
vnc-tls.c

@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  * THE SOFTWARE.
  */
  */
 
 
+#include "qemu-x509.h"
 #include "vnc.h"
 #include "vnc.h"
 #include "qemu_socket.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,
 int vnc_tls_set_x509_creds_dir(VncDisplay *vd,
                                const char *certdir)
                                const char *certdir)
 {
 {