comparison svr-main.c @ 844:68facbc41273

merge again
author Matt Johnston <matt@ucc.asn.au>
date Fri, 01 Nov 2013 00:19:25 +0800
parents 7f604f9b3756
children 220f55d540ae
comparison
equal deleted inserted replaced
834:e378da7eae5d 844:68facbc41273
27 #include "session.h" 27 #include "session.h"
28 #include "buffer.h" 28 #include "buffer.h"
29 #include "signkey.h" 29 #include "signkey.h"
30 #include "runopts.h" 30 #include "runopts.h"
31 #include "random.h" 31 #include "random.h"
32 #include "crypto_desc.h"
32 33
33 static size_t listensockets(int *sock, size_t sockcount, int *maxfd); 34 static size_t listensockets(int *sock, size_t sockcount, int *maxfd);
34 static void sigchld_handler(int dummy); 35 static void sigchld_handler(int dummy);
35 static void sigsegv_handler(int); 36 static void sigsegv_handler(int);
36 static void sigintterm_handler(int fish); 37 static void sigintterm_handler(int fish);
381 } 382 }
382 if (signal(SIGSEGV, sigsegv_handler) == SIG_ERR) { 383 if (signal(SIGSEGV, sigsegv_handler) == SIG_ERR) {
383 dropbear_exit("signal() error"); 384 dropbear_exit("signal() error");
384 } 385 }
385 386
387 crypto_init();
388
386 /* Now we can setup the hostkeys - needs to be after logging is on, 389 /* Now we can setup the hostkeys - needs to be after logging is on,
387 * otherwise we might end up blatting error messages to the socket */ 390 * otherwise we might end up blatting error messages to the socket */
388 loadhostkeys(); 391 load_all_hostkeys();
389 392
390 seedrandom(); 393 seedrandom();
391 } 394 }
392 395
393 /* Set up listening sockets for all the requested ports */ 396 /* Set up listening sockets for all the requested ports */