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.37 by pcg, Wed Mar 23 14:33:34 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 ();
… …
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"), \
173 name, var, fname, lineno); \
174} while (0) 183} while (0)
175 184
176void 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)
177{ 484{
178 char *fname; 485 char *fname;
179 FILE *f; 486 FILE *f;
180 487
181 clear_config (); 488 conf.clear ();
182 489
183 asprintf (&fname, "%s/gvpe.conf", confbase); 490 asprintf (&fname, "%s/gvpe.conf", confbase);
184 f = fopen (fname, "r"); 491 f = fopen (fname, "r");
185 492
186 if (f) 493 if (f)
187 { 494 {
188 char line[16384]; 495 char line[16384];
189 int lineno = 0; 496 int lineno = 0;
190 char *var, *val; 497 node = &conf.default_node;
191 conf_node *node = &default_node;
192 498
193 while (fgets (line, sizeof (line), f)) 499 while (fgets (line, sizeof (line), f))
194 { 500 {
195 lineno++; 501 lineno++;
196 502
197 { 503 const char *warn = parse_line (line);
198 char *end = line + strlen (line);
199 504
200 while (*end < ' ' && end >= line) 505 if (warn)
201 end--; 506 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
202
203 *++end = 0;
204 }
205
206 char *tok = line;
207
208retry:
209 var = strtok (tok, "\t =");
210 tok = 0;
211
212 if (!var || !var[0])
213 continue; /* no tokens on this line */
214
215 if (var[0] == '#')
216 continue; /* comment: ignore */
217
218 val = strtok (NULL, "\t\n\r =");
219
220 if (!val || val[0] == '#')
221 {
222 slog (L_WARN,
223 _("no value for variable `%s', at '%s' line %d, skipping."),
224 var, fname, lineno);
225 continue;
226 }
227
228 if (!strcmp (var, "on"))
229 {
230 if (!::thisnode
231 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
232 || !strcmp (val, ::thisnode))
233 goto retry;
234
235 continue;
236 }
237
238 // truly global
239 if (!strcmp (var, "loglevel"))
240 {
241 loglevel l = string_to_loglevel (val);
242
243 if (l != L_NONE)
244 llevel = l;
245 else
246 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
247 }
248 else if (!strcmp (var, "ip-proto"))
249 ip_proto = atoi (val);
250 else if (!strcmp (var, "icmp-type"))
251 {
252#if ENABLE_ICMP
253 icmp_type = atoi (val);
254#endif
255 }
256
257 // per config
258 else if (!strcmp (var, "node"))
259 {
260 default_node.id++;
261
262 node = new conf_node (default_node);
263
264 nodes.push_back (node);
265
266 node->nodename = strdup (val);
267
268 {
269 char *fname;
270 FILE *f;
271
272 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
273
274 f = fopen (fname, "r");
275 if (f)
276 {
277 node->rsa_key = RSA_new ();
278
279 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
280 {
281 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
282 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
283 exit (EXIT_FAILURE);
284 }
285
286 require (RSA_blinding_on (node->rsa_key, 0));
287
288 fclose (f);
289 }
290 else
291 {
292 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
293
294 if (need_keys)
295 exit (EXIT_FAILURE);
296 }
297
298 free (fname);
299 }
300
301 if (::thisnode && !strcmp (node->nodename, ::thisnode))
302 thisnode = node;
303 }
304 else if (!strcmp (var, "private-key"))
305 free (prikeyfile), prikeyfile = strdup (val);
306 else if (!strcmp (var, "ifpersist"))
307 parse_bool (ifpersist, "ifpersist", true, false);
308 else if (!strcmp (var, "ifname"))
309 free (ifname), ifname = strdup (val);
310 else if (!strcmp (var, "rekey"))
311 rekey = atoi (val);
312 else if (!strcmp (var, "keepalive"))
313 keepalive = atoi (val);
314 else if (!strcmp (var, "mtu"))
315 mtu = atoi (val);
316 else if (!strcmp (var, "if-up"))
317 free (script_if_up), script_if_up = strdup (val);
318 else if (!strcmp (var, "node-up"))
319 free (script_node_up), script_node_up = strdup (val);
320 else if (!strcmp (var, "node-down"))
321 free (script_node_down), script_node_down = strdup (val);
322 else if (!strcmp (var, "pid-file"))
323 free (pidfilename), pidfilename = strdup (val);
324 else if (!strcmp (var, "dns-forw-host"))
325 {
326#if ENABLE_DNS
327 free (dns_forw_host), dns_forw_host = strdup (val);
328#endif
329 }
330 else if (!strcmp (var, "dns-forw-port"))
331 {
332#if ENABLE_DNS
333 dns_forw_port = atoi (val);
334#endif
335 }
336 else if (!strcmp (var, "http-proxy-host"))
337 {
338#if ENABLE_HTTP_PROXY
339 free (proxy_host), proxy_host = strdup (val);
340#endif
341 }
342 else if (!strcmp (var, "http-proxy-port"))
343 {
344#if ENABLE_HTTP_PROXY
345 proxy_port = atoi (val);
346#endif
347 }
348 else if (!strcmp (var, "http-proxy-auth"))
349 {
350#if ENABLE_HTTP_PROXY
351 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
352#endif
353 }
354
355 /* node-specific, non-defaultable */
356 else if (node != &default_node && !strcmp (var, "hostname"))
357 free (node->hostname), node->hostname = strdup (val);
358
359 /* node-specific, defaultable */
360 else if (!strcmp (var, "udp-port"))
361 node->udp_port = atoi (val);
362 else if (!strcmp (var, "tcp-port"))
363 node->tcp_port = atoi (val);
364 else if (!strcmp (var, "dns-hostname"))
365 {
366#if ENABLE_DNS
367 free (node->dns_hostname), node->dns_hostname = strdup (val);
368#endif
369 }
370 else if (!strcmp (var, "dns-port"))
371 {
372#if ENABLE_DNS
373 node->dns_port = atoi (val);
374#endif
375 }
376 else if (!strcmp (var, "dns-domain"))
377 {
378#if ENABLE_DNS
379 free (node->domain), node->domain = strdup (val);
380#endif
381 }
382 else if (!strcmp (var, "router-priority"))
383 node->routerprio = atoi (val);
384 else if (!strcmp (var, "max-retry"))
385 node->max_retry = atoi (val);
386 else if (!strcmp (var, "connect"))
387 {
388 if (!strcmp (val, "ondemand"))
389 node->connectmode = conf_node::C_ONDEMAND;
390 else if (!strcmp (val, "never"))
391 node->connectmode = conf_node::C_NEVER;
392 else if (!strcmp (val, "always"))
393 node->connectmode = conf_node::C_ALWAYS;
394 else if (!strcmp (val, "disabled"))
395 node->connectmode = conf_node::C_DISABLED;
396 else
397 slog (L_WARN,
398 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
399 var, fname, lineno);
400 }
401 else if (!strcmp (var, "inherit-tos"))
402 parse_bool (node->inherit_tos, "inherit-tos", true, false);
403 else if (!strcmp (var, "compress"))
404 parse_bool (node->compress, "compress", true, false);
405 // all these bool options really really cost a lot of executable size!
406 else if (!strcmp (var, "enable-tcp"))
407 {
408#if ENABLE_TCP
409 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
410#endif
411 }
412 else if (!strcmp (var, "enable-icmp"))
413 {
414#if ENABLE_ICMP
415 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
416#endif
417 }
418 else if (!strcmp (var, "enable-dns"))
419 {
420#if ENABLE_DNS
421 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
422#endif
423 }
424 else if (!strcmp (var, "enable-udp"))
425 {
426 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
427 }
428 else if (!strcmp (var, "enable-rawip"))
429 {
430 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
431 }
432
433 // unknown or misplaced
434 else
435 slog (L_WARN,
436 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
437 var, fname, lineno);
438 } 507 }
439 508
440 fclose (f); 509 fclose (f);
510
511 parse_argv ();
441 } 512 }
442 else 513 else
443 { 514 {
444 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));
445 exit (EXIT_FAILURE); 516 exit (EXIT_FAILURE);
446 } 517 }
447 518
448 free (fname); 519 free (fname);
449 520
450 fname = config_filename (prikeyfile, "hostkey"); 521 fname = conf.config_filename (conf.prikeyfile, "hostkey");
451 522
452 f = fopen (fname, "r"); 523 f = fopen (fname, "r");
453 if (f) 524 if (f)
454 { 525 {
455 rsa_key = RSA_new (); 526 conf.rsa_key = RSA_new ();
456 527
457 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 528 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
458 { 529 {
459 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 530 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
460 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));
461 exit (EXIT_FAILURE); 532 exit (EXIT_FAILURE);
462 } 533 }
463 534
464 require (RSA_blinding_on (rsa_key, 0)); 535 require (RSA_blinding_on (conf.rsa_key, 0));
465 536
466 fclose (f); 537 fclose (f);
467 } 538 }
468 else 539 else
469 { 540 {
… …
472 if (need_keys) 543 if (need_keys)
473 exit (EXIT_FAILURE); 544 exit (EXIT_FAILURE);
474 } 545 }
475 546
476 if (need_keys && ::thisnode 547 if (need_keys && ::thisnode
477 && rsa_key && thisnode && thisnode->rsa_key) 548 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
478 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
479 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0) 550 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
480 { 551 {
481 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);
482 exit (EXIT_FAILURE); 553 exit (EXIT_FAILURE);
483 } 554 }
484 555

Diff Legend

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