summaryrefslogtreecommitdiffstats
path: root/src/initconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/initconf.c')
-rw-r--r--src/initconf.c26
1 files changed, 18 insertions, 8 deletions
diff --git a/src/initconf.c b/src/initconf.c
index be697e8..0149ac9 100644
--- a/src/initconf.c
+++ b/src/initconf.c
@@ -22,6 +22,7 @@
22#include <stdio.h> 22#include <stdio.h>
23#include <stdlib.h> 23#include <stdlib.h>
24#include <gnutls/gnutls.h> 24#include <gnutls/gnutls.h>
25#include <gnutls/x509.h>
25#include <glib.h> 26#include <glib.h>
26#include "userpref.h" 27#include "userpref.h"
27 28
@@ -54,6 +55,7 @@ int main(int argc, char *argv[]) {
54 55
55 gnutls_global_init(); 56 gnutls_global_init();
56 57
58 size_t size;
57 char* host_id = NULL; //"29942970-207913891623273984" 59 char* host_id = NULL; //"29942970-207913891623273984"
58 gnutls_x509_privkey_t root_privkey; 60 gnutls_x509_privkey_t root_privkey;
59 gnutls_x509_privkey_t host_privkey; 61 gnutls_x509_privkey_t host_privkey;
@@ -99,26 +101,34 @@ int main(int argc, char *argv[]) {
99 gnutls_datum_t root_key_pem = {NULL, 0}; 101 gnutls_datum_t root_key_pem = {NULL, 0};
100 gnutls_datum_t host_key_pem = {NULL, 0}; 102 gnutls_datum_t host_key_pem = {NULL, 0};
101 103
102 gnutls_x509_privkey_export (root_privkey, GNUTLS_X509_FMT_PEM, NULL, &root_key_pem.size); 104 gnutls_x509_privkey_export (root_privkey, GNUTLS_X509_FMT_PEM, NULL, &size);
103 gnutls_x509_privkey_export (host_privkey, GNUTLS_X509_FMT_PEM, NULL, &host_key_pem.size); 105 root_key_pem.size = size;
106 gnutls_x509_privkey_export (host_privkey, GNUTLS_X509_FMT_PEM, NULL, &size);
107 host_key_pem.size = size;
104 108
105 root_key_pem.data = gnutls_malloc(root_key_pem.size); 109 root_key_pem.data = gnutls_malloc(root_key_pem.size);
106 host_key_pem.data = gnutls_malloc(host_key_pem.size); 110 host_key_pem.data = gnutls_malloc(host_key_pem.size);
107 111
108 gnutls_x509_privkey_export (root_privkey, GNUTLS_X509_FMT_PEM, root_key_pem.data, &root_key_pem.size); 112 gnutls_x509_privkey_export (root_privkey, GNUTLS_X509_FMT_PEM, root_key_pem.data, &size);
109 gnutls_x509_privkey_export (host_privkey, GNUTLS_X509_FMT_PEM, host_key_pem.data, &host_key_pem.size); 113 root_key_pem.size = size;
114 gnutls_x509_privkey_export (host_privkey, GNUTLS_X509_FMT_PEM, host_key_pem.data, &size);
115 host_key_pem.size = size;
110 116
111 gnutls_datum_t root_cert_pem = {NULL, 0}; 117 gnutls_datum_t root_cert_pem = {NULL, 0};
112 gnutls_datum_t host_cert_pem = {NULL, 0}; 118 gnutls_datum_t host_cert_pem = {NULL, 0};
113 119
114 gnutls_x509_crt_export (root_cert, GNUTLS_X509_FMT_PEM, NULL, &root_cert_pem.size); 120 gnutls_x509_crt_export (root_cert, GNUTLS_X509_FMT_PEM, NULL, &size);
115 gnutls_x509_crt_export (host_cert, GNUTLS_X509_FMT_PEM, NULL, &host_cert_pem.size); 121 root_cert_pem.size = size;
122 gnutls_x509_crt_export (host_cert, GNUTLS_X509_FMT_PEM, NULL, &size);
123 host_cert_pem.size = size;
116 124
117 root_cert_pem.data = gnutls_malloc(root_cert_pem.size); 125 root_cert_pem.data = gnutls_malloc(root_cert_pem.size);
118 host_cert_pem.data = gnutls_malloc(host_cert_pem.size); 126 host_cert_pem.data = gnutls_malloc(host_cert_pem.size);
119 127
120 gnutls_x509_crt_export (root_cert, GNUTLS_X509_FMT_PEM, root_cert_pem.data, &root_cert_pem.size); 128 gnutls_x509_crt_export (root_cert, GNUTLS_X509_FMT_PEM, root_cert_pem.data, &size);
121 gnutls_x509_crt_export (host_cert, GNUTLS_X509_FMT_PEM, host_cert_pem.data, &host_cert_pem.size); 129 root_cert_pem.size = size;
130 gnutls_x509_crt_export (host_cert, GNUTLS_X509_FMT_PEM, host_cert_pem.data, &size);
131 host_cert_pem.size = size;
122 132
123 133
124 /* store values in config file */ 134 /* store values in config file */