/mandos/release : revision 237.7.296

To get this branch, use:

bzr branch
http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to plugins.d/mandos-client.c

Committer: Teddy Hogeborn
Date: 2015-05-23 10:41:35 UTC
mto: (237.7.304 trunk)
mto: This revision was merged to the branch mainline in revision 325.
Revision ID: teddy@recompile.se-20150523104135-s08sbkurj1wf0jrz

mandos-keygen: Update copyright year.

Show diffs side-by-side

added added

removed removed

plugins.d/mandos-client.c

234

.af = af };

235

if(new_server->ip == NULL){

236

perror_plus("strdup");

237

free(new_server);

237

238

return false;

238

239

}

239

240

ret = clock_gettime(CLOCK_MONOTONIC, &(new_server->last_seen));

240

241

if(ret == -1){

241

242

perror_plus("clock_gettime");

243

#ifdef __GNUC__

244

#pragma GCC diagnostic push

245

#pragma GCC diagnostic ignored "-Wcast-qual"

246

#endif

247

free((char *)(new_server->ip));

248

#ifdef __GNUC__

249

#pragma GCC diagnostic pop

250

#endif

251

free(new_server);

242

252

return false;

243

253

}

244

254

/* Special case of first server */

483

493

return plaintext_length;

484

494

}

485

495

496

__attribute__((warn_unused_result, const))

497

static const char *safe_string(const char *str){

498

if(str == NULL)

499

return "(unknown)";

500

return str;

501

}

502

486

503

__attribute__((warn_unused_result))

487

504

static const char *safer_gnutls_strerror(int value){

488

505

const char *ret = gnutls_strerror(value);

489

if(ret == NULL)

490

ret = "(unknown)";

491

return ret;

506

return safe_string(ret);

492

507

}

493

508

494

509

/* GnuTLS log function callback */

503

518

const char *seckeyfilename,

504

519

mandos_context *mc){

505

520

int ret;

521

unsigned int uret;

506

522

507

523

if(debug){

508

524

fprintf_plus(stderr, "Initializing GnuTLS\n");

559

575

safer_gnutls_strerror(ret));

560

576

goto globalfail;

561

577

}

578

if(mc->dh_bits == 0){

579

/* Find out the optimal number of DH bits */

580

/* Try to read the private key file */

581

gnutls_datum_t buffer = { .data = NULL, .size = 0 };

582

{

583

int secfile = open(seckeyfilename, O_RDONLY);

584

size_t buffer_capacity = 0;

585

while(true){

586

buffer_capacity = incbuffer((char **)&buffer.data,

587

(size_t)buffer.size,

588

(size_t)buffer_capacity);

589

if(buffer_capacity == 0){

590

perror_plus("incbuffer");

591

free(buffer.data);

592

buffer.data = NULL;

593

break;

594

}

595

ssize_t bytes_read = read(secfile, buffer.data + buffer.size,

596

BUFFER_SIZE);

597

/* EOF */

598

if(bytes_read == 0){

599

break;

600

}

601

/* check bytes_read for failure */

602

if(bytes_read < 0){

603

perror_plus("read");

604

free(buffer.data);

605

buffer.data = NULL;

606

break;

607

}

608

buffer.size += (unsigned int)bytes_read;

609

}

610

close(secfile);

611

}

612

/* If successful, use buffer to parse private key */

613

gnutls_sec_param_t sec_param = GNUTLS_SEC_PARAM_ULTRA;

614

if(buffer.data != NULL){

615

{

616

gnutls_openpgp_privkey_t privkey = NULL;

617

ret = gnutls_openpgp_privkey_init(&privkey);

618

if(ret != GNUTLS_E_SUCCESS){

619

fprintf_plus(stderr, "Error initializing OpenPGP key"

620

" structure: %s", safer_gnutls_strerror(ret));

621

free(buffer.data);

622

buffer.data = NULL;

623

} else {

624

ret = gnutls_openpgp_privkey_import(privkey, &buffer,

625

GNUTLS_OPENPGP_FMT_BASE64,

626

"", 0);

627

if(ret != GNUTLS_E_SUCCESS){

628

fprintf_plus(stderr, "Error importing OpenPGP key : %s",

629

safer_gnutls_strerror(ret));

630

privkey = NULL;

631

}

632

free(buffer.data);

633

buffer.data = NULL;

634

if(privkey != NULL){

635

/* Use private key to suggest an appropriate sec_param */

636

sec_param = gnutls_openpgp_privkey_sec_param(privkey);

637

gnutls_openpgp_privkey_deinit(privkey);

638

if(debug){

639

fprintf_plus(stderr, "This OpenPGP key implies using a"

640

" GnuTLS security parameter \"%s\".\n",

641

safe_string(gnutls_sec_param_get_name

642

(sec_param)));

643

}

644

}

645

}

646

}

647

if(sec_param == GNUTLS_SEC_PARAM_UNKNOWN){

648

/* Err on the side of caution */

649

sec_param = GNUTLS_SEC_PARAM_ULTRA;

650

if(debug){

651

fprintf_plus(stderr, "Falling back to security parameter"

652

" \"%s\"\n",

653

safe_string(gnutls_sec_param_get_name

654

(sec_param)));

655

}

656

}

657

}

658

uret = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, sec_param);

659

if(uret != 0){

660

mc->dh_bits = uret;

661

if(debug){

662

fprintf_plus(stderr, "A \"%s\" GnuTLS security parameter"

663

" implies %u DH bits; using that.\n",

664

safe_string(gnutls_sec_param_get_name

665

(sec_param)),

666

mc->dh_bits);

667

}

668

} else {

669

fprintf_plus(stderr, "Failed to get implied number of DH"

670

" bits for security parameter \"%s\"): %s\n",

671

safe_string(gnutls_sec_param_get_name(sec_param)),

672

safer_gnutls_strerror(ret));

673

goto globalfail;

674

}

675

} else if(debug){

676

fprintf_plus(stderr, "DH bits explicitly set to %u\n",

677

mc->dh_bits);

678

}

562

679

ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits);

563

680

if(ret != GNUTLS_E_SUCCESS){

564

fprintf_plus(stderr, "Error in GnuTLS prime generation: %s\n",

565

safer_gnutls_strerror(ret));

681

fprintf_plus(stderr, "Error in GnuTLS prime generation (%u bits):"

682

" %s\n", mc->dh_bits, safer_gnutls_strerror(ret));

566

683

goto globalfail;

567

684

}

568

685

1066

1183

timed out */

1067

1184

1068

1185

if(quit_now){

1186

avahi_s_service_resolver_free(r);

1069

1187

return;

1070

1188

}

1071

1189

1639

1757

_exit(EXIT_FAILURE);

1640

1758

}

1641

1759

} else {

1760

if(hook_pid == -1){

1761

perror_plus("fork");

1762

free(direntry);

1763

continue;

1764

}

1642

1765

int status;

1643

1766

if(TEMP_FAILURE_RETRY(waitpid(hook_pid, &status, 0)) == -1){

1644

1767

perror_plus("waitpid");

1768

free(direntry);

1645

1769

continue;

1646

1770

}

1647

1771

if(WIFEXITED(status)){

1649

1773

fprintf_plus(stderr, "Warning: network hook \"%s\" exited"

1650

1774

" with status %d\n", direntry->d_name,

1651

1775

WEXITSTATUS(status));

1776

free(direntry);

1652

1777

continue;

1653

1778

}

1654

1779

} else if(WIFSIGNALED(status)){

1655

1780

fprintf_plus(stderr, "Warning: network hook \"%s\" died by"

1656

1781

" signal %d\n", direntry->d_name,

1657

1782

WTERMSIG(status));

1783

free(direntry);

1658

1784

continue;

1659

1785

} else {

1660

1786

fprintf_plus(stderr, "Warning: network hook \"%s\""

1661

1787

" crashed\n", direntry->d_name);

1788

free(direntry);

1662

1789

continue;

1663

1790

}

1664

1791

}

1666

1793

fprintf_plus(stderr, "Network hook \"%s\" ran successfully\n",

1667

1794

direntry->d_name);

1668

1795

}

1796

free(direntry);

1669

1797

}

1670

1798

free(direntries);

1671

1799

if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){

1879

2007

}

1880

2008

1881

2009

int main(int argc, char *argv[]){

1882

mandos_context mc = { .server = NULL, .dh_bits = 1024,

2010

mandos_context mc = { .server = NULL, .dh_bits = 0,

1883

2011

.priority = "SECURE256:!CTYPE-X.509:"

1884

"+CTYPE-OPENPGP", .current_server = NULL,

2012

"+CTYPE-OPENPGP:!RSA", .current_server = NULL,

1885

2013

.interfaces = NULL, .interfaces_size = 0 };

1886

2014

AvahiSServiceBrowser *sb = NULL;

1887

2015

error_t ret_errno;

2265

2393

if(ret_errno != 0){

2266

2394

errno = ret_errno;

2267

2395

perror_plus("argz_add");

2396

free(direntries[i]);

2268

2397

continue;

2269

2398

}

2270

2399

if(debug){

2271

2400

fprintf_plus(stderr, "Will use interface \"%s\"\n",

2272

2401

direntries[i]->d_name);

2273

2402

}

2403

free(direntries[i]);

2274

2404

}

2275

2405

free(direntries);

2276

2406

} else {

2546

2676

mc.current_server->prev->next = NULL;

2547

2677

while(mc.current_server != NULL){

2548

2678

server *next = mc.current_server->next;

2679

#ifdef __GNUC__

2680

#pragma GCC diagnostic push

2681

#pragma GCC diagnostic ignored "-Wcast-qual"

2682

#endif

2683

free((char *)(mc.current_server->ip));

2684

#ifdef __GNUC__

2685

#pragma GCC diagnostic pop

2686

#endif

2549

2687

free(mc.current_server);

2550

2688

mc.current_server = next;

2551

2689

}

2620

2758

" \"%s\", 0): %s\n", tempdir,

2621

2759

direntries[i]->d_name, strerror(errno));

2622

2760

}

2761

free(direntries[i]);

2623

2762

}

2624

2763

2625

2764

/* need to clean even if 0 because man page doesn't specify */

Older »