Mercurial > dropbear

comparison svr-runopts.c @ 852:7540c0822374 ecc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Various cleanups and fixes for warnings
author Matt Johnston <matt@ucc.asn.au>
date Tue, 12 Nov 2013 23:02:32 +0800
parents f4bb964c8678
children c19acba28590
comparison
equal deleted inserted replaced
851:c1c1b43f78c2 852:7540c0822374
408 dropbear_log(LOG_WARNING, "Failed loading %s", keyfile); 408 dropbear_log(LOG_WARNING, "Failed loading %s", keyfile);
409 } 409 }
410 410
411 #ifdef DROPBEAR_RSA 411 #ifdef DROPBEAR_RSA
412 if (type == DROPBEAR_SIGNKEY_RSA) { 412 if (type == DROPBEAR_SIGNKEY_RSA) {
413 loadhostkey_helper("RSA", &read_key->rsakey, &svr_opts.hostkey->rsakey, fatal_duplicate); 413 loadhostkey_helper("RSA", (void**)&read_key->rsakey, (void**)&svr_opts.hostkey->rsakey, fatal_duplicate);
414 } 414 }
415 #endif 415 #endif
416 416
417 #ifdef DROPBEAR_DSS 417 #ifdef DROPBEAR_DSS
418 if (type == DROPBEAR_SIGNKEY_DSS) { 418 if (type == DROPBEAR_SIGNKEY_DSS) {
419 loadhostkey_helper("DSS", &read_key->dsskey, &svr_opts.hostkey->dsskey, fatal_duplicate); 419 loadhostkey_helper("DSS", (void**)&read_key->dsskey, (void**)&svr_opts.hostkey->dsskey, fatal_duplicate);
420 } 420 }
421 #endif 421 #endif
422 422
423 #ifdef DROPBEAR_ECDSA 423 #ifdef DROPBEAR_ECDSA
424 #ifdef DROPBEAR_ECC_256 424 #ifdef DROPBEAR_ECC_256
425 if (type == DROPBEAR_SIGNKEY_ECDSA_NISTP256) { 425 if (type == DROPBEAR_SIGNKEY_ECDSA_NISTP256) {
426 loadhostkey_helper("ECDSA256", &read_key->ecckey256, &svr_opts.hostkey->ecckey256, fatal_duplicate); 426 loadhostkey_helper("ECDSA256", (void**)&read_key->ecckey256, (void**)&svr_opts.hostkey->ecckey256, fatal_duplicate);
427 } 427 }
428 #endif 428 #endif
429 #ifdef DROPBEAR_ECC_384 429 #ifdef DROPBEAR_ECC_384
430 if (type == DROPBEAR_SIGNKEY_ECDSA_NISTP384) { 430 if (type == DROPBEAR_SIGNKEY_ECDSA_NISTP384) {
431 loadhostkey_helper("ECDSA384", &read_key->ecckey384, &svr_opts.hostkey->ecckey384, fatal_duplicate); 431 loadhostkey_helper("ECDSA384", (void**)&read_key->ecckey384, (void**)&svr_opts.hostkey->ecckey384, fatal_duplicate);
432 } 432 }
433 #endif 433 #endif
434 #ifdef DROPBEAR_ECC_521 434 #ifdef DROPBEAR_ECC_521
435 if (type == DROPBEAR_SIGNKEY_ECDSA_NISTP521) { 435 if (type == DROPBEAR_SIGNKEY_ECDSA_NISTP521) {
436 loadhostkey_helper("ECDSA521", &read_key->ecckey521, &svr_opts.hostkey->ecckey521, fatal_duplicate); 436 loadhostkey_helper("ECDSA521", (void**)&read_key->ecckey521, (void**)&svr_opts.hostkey->ecckey521, fatal_duplicate);
437 } 437 }
438 #endif 438 #endif
439 #endif // DROPBEAR_ECDSA 439 #endif // DROPBEAR_ECDSA
440 sign_key_free(read_key); 440 sign_key_free(read_key);
441 TRACE(("leave loadhostkey")) 441 TRACE(("leave loadhostkey"))