ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/conf.C
(Generate patch)

Comparing gvpe/src/conf.C (file contents):
Revision 1.35 by pcg, Fri Mar 18 01:53:05 2005 UTC vs.
Revision 1.40 by pcg, Mon Mar 28 20:39:18 2005 UTC

… …
88 ); 88 );
89} 89}
90 90
91conf_node::~conf_node () 91conf_node::~conf_node ()
92{ 92{
93#if 0
94 // does not work, because string pointers etc. are shared
95 // is not called, however
93 if (rsa_key) 96 if (rsa_key)
94 RSA_free (rsa_key); 97 RSA_free (rsa_key);
95 98
96 free (nodename); 99 free (nodename);
97 free (hostname); 100 free (hostname);
101 free (if_up_data);
98#if ENABLE_DNS 102#if ENABLE_DNS
99 free (domain); 103 free (domain);
100 free (dns_hostname); 104 free (dns_hostname);
105#endif
101#endif 106#endif
102} 107}
103 108
104void configuration::init () 109void configuration::init ()
105{ 110{
… …
118 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm 123 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
119 default_node.connectmode = conf_node::C_ALWAYS; 124 default_node.connectmode = conf_node::C_ALWAYS;
120 default_node.compress = true; 125 default_node.compress = true;
121 default_node.protocols = 0; 126 default_node.protocols = 0;
122 default_node.max_retry = DEFAULT_MAX_RETRY; 127 default_node.max_retry = DEFAULT_MAX_RETRY;
128 default_node.if_up_data = strdup ("");
123 129
124#if ENABLE_DNS 130#if ENABLE_DNS
125 default_node.dns_port = 0; // default is 0 == client 131 default_node.dns_port = 0; // default is 0 == client
132
126 dns_forw_host = strdup ("127.0.0.1"); 133 dns_forw_host = strdup ("127.0.0.1");
127 dns_forw_port = 53; 134 dns_forw_port = 53;
135 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
136 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
137 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
138 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
128#endif 139#endif
129 140
130 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 141 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
131} 142}
132 143
… …
147 free (dns_forw_host); dns_forw_host = 0; 158 free (dns_forw_host); dns_forw_host = 0;
148#endif 159#endif
149} 160}
150 161
151void 162void
152configuration::clear_config () 163configuration::clear ()
153{ 164{
154 for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i) 165 for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i)
155 delete *i; 166 delete *i;
156 167
157 nodes.clear (); 168 nodes.clear ();
158 169
159 cleanup (); 170 cleanup ();
160 init (); 171 init ();
161} 172}
162 173
163#define parse_bool(target,name,trueval,falseval) \ 174#define parse_bool(target,name,trueval,falseval) do { \
164 if (!strcmp (val, "yes")) target = trueval; \ 175 if (!strcmp (val, "yes")) target = trueval; \
165 else if (!strcmp (val, "no")) target = falseval; \ 176 else if (!strcmp (val, "no")) target = falseval; \
166 else if (!strcmp (val, "true")) target = trueval; \ 177 else if (!strcmp (val, "true")) target = trueval; \
167 else if (!strcmp (val, "false")) target = falseval; \ 178 else if (!strcmp (val, "false")) target = falseval; \
168 else if (!strcmp (val, "on")) target = trueval; \ 179 else if (!strcmp (val, "on")) target = trueval; \
169 else if (!strcmp (val, "off")) target = falseval; \ 180 else if (!strcmp (val, "off")) target = falseval; \
170 else \ 181 else \
171 slog (L_WARN, \ 182 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \
172 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 183} while (0)
173 name, var, fname, lineno);
174 184
175void configuration::read_config (bool need_keys) 185const char *
186configuration_parser::parse_line (char *line)
187{
188 {
189 char *end = line + strlen (line);
190
191 while (*end < ' ' && end >= line)
192 end--;
193
194 *++end = 0;
195 }
196
197 char *tok = line;
198 const char *var = strtok (tok, "\t =");
199 tok = 0;
200
201 if (!var || !var[0])
202 return 0; /* no tokens on this line */
203
204 if (var[0] == '#')
205 return 0; /* comment: ignore */
206
207 char *val = strtok (NULL, "\t\n\r =");
208
209 if (!val || val[0] == '#')
210 return _("no value given for variable. (ignored)");
211
212 if (!strcmp (var, "on"))
213 {
214 if (!::thisnode
215 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
216 || !strcmp (val, ::thisnode))
217 return parse_line (strtok (NULL, "\n\r"));
218 else
219 return 0;
220 }
221
222 // truly global
223 if (!strcmp (var, "loglevel"))
224 {
225 loglevel l = string_to_loglevel (val);
226
227 if (l == L_NONE)
228 return _("unknown loglevel. (skipping)");
229 }
230 else if (!strcmp (var, "ip-proto"))
231 conf.ip_proto = atoi (val);
232 else if (!strcmp (var, "icmp-type"))
233 {
234#if ENABLE_ICMP
235 conf.icmp_type = atoi (val);
236#endif
237 }
238
239 // per config
240 else if (!strcmp (var, "node"))
241 {
242 parse_argv ();
243
244 conf.default_node.id++;
245 node = new conf_node (conf.default_node);
246 conf.nodes.push_back (node);
247 node->nodename = strdup (val);
248
249 {
250 char *fname;
251 FILE *f;
252
253 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
254
255 f = fopen (fname, "r");
256 if (f)
257 {
258 node->rsa_key = RSA_new ();
259
260 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
261 {
262 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
263 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
264 exit (EXIT_FAILURE);
265 }
266
267 require (RSA_blinding_on (node->rsa_key, 0));
268
269 fclose (f);
270 }
271 else
272 {
273 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
274
275 if (need_keys)
276 exit (EXIT_FAILURE);
277 }
278
279 free (fname);
280 }
281
282 if (::thisnode && !strcmp (node->nodename, ::thisnode))
283 conf.thisnode = node;
284 }
285 else if (!strcmp (var, "private-key"))
286 free (conf.prikeyfile), conf.prikeyfile = strdup (val);
287 else if (!strcmp (var, "ifpersist"))
288 parse_bool (conf.ifpersist, "ifpersist", true, false);
289 else if (!strcmp (var, "ifname"))
290 free (conf.ifname), conf.ifname = strdup (val);
291 else if (!strcmp (var, "rekey"))
292 conf.rekey = atoi (val);
293 else if (!strcmp (var, "keepalive"))
294 conf.keepalive = atoi (val);
295 else if (!strcmp (var, "mtu"))
296 conf.mtu = atoi (val);
297 else if (!strcmp (var, "if-up"))
298 free (conf.script_if_up), conf.script_if_up = strdup (val);
299 else if (!strcmp (var, "node-up"))
300 free (conf.script_node_up), conf.script_node_up = strdup (val);
301 else if (!strcmp (var, "node-down"))
302 free (conf.script_node_down), conf.script_node_down = strdup (val);
303 else if (!strcmp (var, "pid-file"))
304 free (conf.pidfilename), conf.pidfilename = strdup (val);
305 else if (!strcmp (var, "dns-forw-host"))
306 {
307#if ENABLE_DNS
308 free (conf.dns_forw_host), conf.dns_forw_host = strdup (val);
309#endif
310 }
311 else if (!strcmp (var, "dns-forw-port"))
312 {
313#if ENABLE_DNS
314 conf.dns_forw_port = atoi (val);
315#endif
316 }
317 else if (!strcmp (var, "dns-timeout-factor"))
318 {
319#if ENABLE_DNS
320 conf.dns_timeout_factor = atof (val);
321#endif
322 }
323 else if (!strcmp (var, "dns-send-interval"))
324 {
325#if ENABLE_DNS
326 conf.dns_send_interval = atoi (val);
327#endif
328 }
329 else if (!strcmp (var, "dns-overlap-factor"))
330 {
331#if ENABLE_DNS
332 conf.dns_overlap_factor = atof (val);
333#endif
334 }
335 else if (!strcmp (var, "dns-max-outstanding"))
336 {
337#if ENABLE_DNS
338 conf.dns_max_outstanding = atoi (val);
339#endif
340 }
341 else if (!strcmp (var, "http-proxy-host"))
342 {
343#if ENABLE_HTTP_PROXY
344 free (conf.proxy_host), conf.proxy_host = strdup (val);
345#endif
346 }
347 else if (!strcmp (var, "http-proxy-port"))
348 {
349#if ENABLE_HTTP_PROXY
350 conf.proxy_port = atoi (val);
351#endif
352 }
353 else if (!strcmp (var, "http-proxy-auth"))
354 {
355#if ENABLE_HTTP_PROXY
356 conf.proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
357#endif
358 }
359
360 /* node-specific, non-defaultable */
361 else if (node != &conf.default_node && !strcmp (var, "hostname"))
362 free (node->hostname), node->hostname = strdup (val);
363
364 /* node-specific, defaultable */
365 else if (!strcmp (var, "udp-port"))
366 node->udp_port = atoi (val);
367 else if (!strcmp (var, "tcp-port"))
368 node->tcp_port = atoi (val);
369 else if (!strcmp (var, "dns-hostname"))
370 {
371#if ENABLE_DNS
372 free (node->dns_hostname), node->dns_hostname = strdup (val);
373#endif
374 }
375 else if (!strcmp (var, "dns-port"))
376 {
377#if ENABLE_DNS
378 node->dns_port = atoi (val);
379#endif
380 }
381 else if (!strcmp (var, "dns-domain"))
382 {
383#if ENABLE_DNS
384 free (node->domain), node->domain = strdup (val);
385#endif
386 }
387 else if (!strcmp (var, "if-up-data"))
388 free (node->if_up_data), node->if_up_data = strdup (val);
389 else if (!strcmp (var, "router-priority"))
390 node->routerprio = atoi (val);
391 else if (!strcmp (var, "max-retry"))
392 node->max_retry = atoi (val);
393 else if (!strcmp (var, "connect"))
394 {
395 if (!strcmp (val, "ondemand"))
396 node->connectmode = conf_node::C_ONDEMAND;
397 else if (!strcmp (val, "never"))
398 node->connectmode = conf_node::C_NEVER;
399 else if (!strcmp (val, "always"))
400 node->connectmode = conf_node::C_ALWAYS;
401 else if (!strcmp (val, "disabled"))
402 node->connectmode = conf_node::C_DISABLED;
403 else
404 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled'. (ignored)");
405 }
406 else if (!strcmp (var, "inherit-tos"))
407 parse_bool (node->inherit_tos, "inherit-tos", true, false);
408 else if (!strcmp (var, "compress"))
409 parse_bool (node->compress, "compress", true, false);
410 // all these bool options really really cost a lot of executable size!
411 else if (!strcmp (var, "enable-tcp"))
412 {
413#if ENABLE_TCP
414 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
415#endif
416 }
417 else if (!strcmp (var, "enable-icmp"))
418 {
419#if ENABLE_ICMP
420 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
421#endif
422 }
423 else if (!strcmp (var, "enable-dns"))
424 {
425#if ENABLE_DNS
426 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
427#endif
428 }
429 else if (!strcmp (var, "enable-udp"))
430 {
431 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
432 }
433 else if (!strcmp (var, "enable-rawip"))
434 {
435 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
436 }
437
438 // unknown or misplaced
439 else
440 return _("unknown configuration directive. (ignored)");
441
442 return 0;
443}
444
445void configuration_parser::parse_argv ()
446{
447 for (int i = 0; i < argc; ++i)
448 {
449 char *v = argv [i];
450
451 if (!*v)
452 continue;
453
454 char *enode = v;
455
456 while (*enode != '.' && *enode > ' ' && *enode != '=' && *enode)
457 enode++;
458
459 if (*enode != '.')
460 enode = 0;
461
462 char *wnode = node == &conf.default_node
463 ? 0
464 : node->nodename;
465
466 if ((!wnode && !enode)
467 || (wnode && enode && !strncmp (wnode, v, enode - v)))
468 {
469 const char *warn = parse_line (enode ? enode + 1 : v);
470
471 if (warn)
472 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
473
474 *v = 0;
475 }
476 }
477}
478
479configuration_parser::configuration_parser (configuration &conf,
480 bool need_keys,
481 int argc,
482 char **argv)
483: conf (conf),need_keys (need_keys), argc (argc), argv (argv)
176{ 484{
177 char *fname; 485 char *fname;
178 FILE *f; 486 FILE *f;
179 487
180 clear_config (); 488 conf.clear ();
181 489
182 asprintf (&fname, "%s/gvpe.conf", confbase); 490 asprintf (&fname, "%s/gvpe.conf", confbase);
183 f = fopen (fname, "r"); 491 f = fopen (fname, "r");
184 492
185 if (f) 493 if (f)
186 { 494 {
187 char line[16384]; 495 char line[16384];
188 int lineno = 0; 496 int lineno = 0;
189 char *var, *val; 497 node = &conf.default_node;
190 conf_node *node = &default_node;
191 498
192 while (fgets (line, sizeof (line), f)) 499 while (fgets (line, sizeof (line), f))
193 { 500 {
194 lineno++; 501 lineno++;
195 502
196 { 503 const char *warn = parse_line (line);
197 char *end = line + strlen (line);
198 504
199 while (*end < ' ' && end >= line) 505 if (warn)
200 end--; 506 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
201
202 *++end = 0;
203 }
204
205 char *tok = line;
206
207retry:
208 var = strtok (tok, "\t =");
209 tok = 0;
210
211 if (!var || !var[0])
212 continue; /* no tokens on this line */
213
214 if (var[0] == '#')
215 continue; /* comment: ignore */
216
217 val = strtok (NULL, "\t\n\r =");
218
219 if (!val || val[0] == '#')
220 {
221 slog (L_WARN,
222 _("no value for variable `%s', at '%s' line %d"),
223 var, fname, lineno);
224 break;
225 }
226
227 if (!strcmp (var, "on"))
228 {
229 if (!::thisnode
230 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
231 || !strcmp (val, ::thisnode))
232 goto retry;
233
234 continue;
235 }
236
237 // truly global
238 if (!strcmp (var, "loglevel"))
239 {
240 loglevel l = string_to_loglevel (val);
241
242 if (l != L_NONE)
243 llevel = l;
244 else
245 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
246 }
247 else if (!strcmp (var, "ip-proto"))
248 ip_proto = atoi (val);
249 else if (!strcmp (var, "icmp-type"))
250 {
251#if ENABLE_ICMP
252 icmp_type = atoi (val);
253#endif
254 }
255
256 // per config
257 else if (!strcmp (var, "node"))
258 {
259 default_node.id++;
260
261 node = new conf_node (default_node);
262
263 nodes.push_back (node);
264
265 node->nodename = strdup (val);
266
267 {
268 char *fname;
269 FILE *f;
270
271 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
272
273 f = fopen (fname, "r");
274 if (f)
275 {
276 node->rsa_key = RSA_new ();
277
278 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
279 {
280 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
281 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
282 exit (EXIT_FAILURE);
283 }
284
285 require (RSA_blinding_on (node->rsa_key, 0));
286
287 fclose (f);
288 }
289 else
290 {
291 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
292
293 if (need_keys)
294 exit (EXIT_FAILURE);
295 }
296
297 free (fname);
298 }
299
300 if (::thisnode && !strcmp (node->nodename, ::thisnode))
301 thisnode = node;
302 }
303 else if (!strcmp (var, "private-key"))
304 free (prikeyfile), prikeyfile = strdup (val);
305 else if (!strcmp (var, "ifpersist"))
306 {
307 parse_bool (ifpersist, "ifpersist", true, false);
308 }
309 else if (!strcmp (var, "ifname"))
310 free (ifname), ifname = strdup (val);
311 else if (!strcmp (var, "rekey"))
312 rekey = atoi (val);
313 else if (!strcmp (var, "keepalive"))
314 keepalive = atoi (val);
315 else if (!strcmp (var, "mtu"))
316 mtu = atoi (val);
317 else if (!strcmp (var, "if-up"))
318 free (script_if_up), script_if_up = strdup (val);
319 else if (!strcmp (var, "node-up"))
320 free (script_node_up), script_node_up = strdup (val);
321 else if (!strcmp (var, "node-down"))
322 free (script_node_down), script_node_down = strdup (val);
323 else if (!strcmp (var, "pid-file"))
324 free (pidfilename), pidfilename = strdup (val);
325 else if (!strcmp (var, "dns-forw-host"))
326 {
327#if ENABLE_DNS
328 free (dns_forw_host), dns_forw_host = strdup (val);
329#endif
330 }
331 else if (!strcmp (var, "dns-forw-port"))
332 {
333#if ENABLE_DNS
334 dns_forw_port = atoi (val);
335#endif
336 }
337 else if (!strcmp (var, "http-proxy-host"))
338 {
339#if ENABLE_HTTP_PROXY
340 free (proxy_host), proxy_host = strdup (val);
341#endif
342 }
343 else if (!strcmp (var, "http-proxy-port"))
344 {
345#if ENABLE_HTTP_PROXY
346 proxy_port = atoi (val);
347#endif
348 }
349 else if (!strcmp (var, "http-proxy-auth"))
350 {
351#if ENABLE_HTTP_PROXY
352 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
353#endif
354 }
355
356 /* node-specific, non-defaultable */
357 else if (node != &default_node && !strcmp (var, "hostname"))
358 free (node->hostname), node->hostname = strdup (val);
359
360 /* node-specific, defaultable */
361 else if (!strcmp (var, "udp-port"))
362 node->udp_port = atoi (val);
363 else if (!strcmp (var, "tcp-port"))
364 node->tcp_port = atoi (val);
365 else if (!strcmp (var, "dns-hostname"))
366 {
367#if ENABLE_DNS
368 free (node->dns_hostname), node->dns_hostname = strdup (val);
369#endif
370 }
371 else if (!strcmp (var, "dns-port"))
372 {
373#if ENABLE_DNS
374 node->dns_port = atoi (val);
375#endif
376 }
377 else if (!strcmp (var, "dns-domain"))
378 {
379#if ENABLE_DNS
380 free (node->domain), node->domain = strdup (val);
381#endif
382 }
383 else if (!strcmp (var, "router-priority"))
384 node->routerprio = atoi (val);
385 else if (!strcmp (var, "max-retry"))
386 node->max_retry = atoi (val);
387 else if (!strcmp (var, "connect"))
388 {
389 if (!strcmp (val, "ondemand"))
390 node->connectmode = conf_node::C_ONDEMAND;
391 else if (!strcmp (val, "never"))
392 node->connectmode = conf_node::C_NEVER;
393 else if (!strcmp (val, "always"))
394 node->connectmode = conf_node::C_ALWAYS;
395 else if (!strcmp (val, "disabled"))
396 node->connectmode = conf_node::C_DISABLED;
397 else
398 slog (L_WARN,
399 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
400 var, fname, lineno);
401 }
402 else if (!strcmp (var, "inherit-tos"))
403 {
404 parse_bool (node->inherit_tos, "inherit-tos", true, false);
405 }
406 else if (!strcmp (var, "compress"))
407 {
408 parse_bool (node->compress, "compress", true, false);
409 }
410 // all these bool options really really cost a lot of executable size!
411 else if (!strcmp (var, "enable-tcp"))
412 {
413#if ENABLE_TCP
414 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
415#endif
416 }
417 else if (!strcmp (var, "enable-icmp"))
418 {
419#if ENABLE_ICMP
420 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
421#endif
422 }
423 else if (!strcmp (var, "enable-dns"))
424 {
425#if ENABLE_DNS
426 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
427#endif
428 }
429 else if (!strcmp (var, "enable-udp"))
430 {
431 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
432 }
433 else if (!strcmp (var, "enable-rawip"))
434 {
435 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
436 }
437
438 // unknown or misplaced
439 else
440 slog (L_WARN,
441 _("unknown or misplaced variable `%s', at '%s' line %d"),
442 var, fname, lineno);
443 } 507 }
444 508
445 fclose (f); 509 fclose (f);
510
511 parse_argv ();
446 } 512 }
447 else 513 else
448 { 514 {
449 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 515 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
450 exit (EXIT_FAILURE); 516 exit (EXIT_FAILURE);
451 } 517 }
452 518
453 free (fname); 519 free (fname);
454 520
455 fname = config_filename (prikeyfile, "hostkey"); 521 fname = conf.config_filename (conf.prikeyfile, "hostkey");
456 522
457 f = fopen (fname, "r"); 523 f = fopen (fname, "r");
458 if (f) 524 if (f)
459 { 525 {
460 rsa_key = RSA_new (); 526 conf.rsa_key = RSA_new ();
461 527
462 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 528 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
463 { 529 {
464 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 530 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
465 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 531 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
466 exit (EXIT_FAILURE); 532 exit (EXIT_FAILURE);
467 } 533 }
468 534
469 require (RSA_blinding_on (rsa_key, 0)); 535 require (RSA_blinding_on (conf.rsa_key, 0));
470 536
471 fclose (f); 537 fclose (f);
472 } 538 }
473 else 539 else
474 { 540 {
… …
477 if (need_keys) 543 if (need_keys)
478 exit (EXIT_FAILURE); 544 exit (EXIT_FAILURE);
479 } 545 }
480 546
481 if (need_keys && ::thisnode 547 if (need_keys && ::thisnode
482 && rsa_key && thisnode && thisnode->rsa_key) 548 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
483 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0 549 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
484 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0) 550 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
485 { 551 {
486 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode); 552 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
487 exit (EXIT_FAILURE); 553 exit (EXIT_FAILURE);
488 } 554 }
489 555

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines