comparison sysoptions.h @ 687:167fdc091c05

Improve RNG seeding. Try to read from /dev/urandom multiple times, take input from extra sources, and use /dev/random when generating private keys
author Matt Johnston <matt@ucc.asn.au>
date Fri, 29 Jun 2012 23:19:43 +0800
parents 405418f7dc5e
children 91dd8328a3ff
comparison
equal deleted inserted replaced
683:63f8d6c469cf 687:167fdc091c05
180 180
181 #if defined(ENABLE_SVR_PASSWORD_AUTH) && defined(ENABLE_SVR_PAM_AUTH) 181 #if defined(ENABLE_SVR_PASSWORD_AUTH) && defined(ENABLE_SVR_PAM_AUTH)
182 #error "You can't turn on PASSWORD and PAM auth both at once. Fix it in options.h" 182 #error "You can't turn on PASSWORD and PAM auth both at once. Fix it in options.h"
183 #endif 183 #endif
184 184
185 #if defined(DROPBEAR_RANDOM_DEV) && defined(DROPBEAR_PRNGD_SOCKET)
186 #error "You can't turn on DROPBEAR_PRNGD_SOCKET and DROPBEAR_RANDOM_DEV at once"
187 #endif
188
189 #if !defined(DROPBEAR_RANDOM_DEV) && !defined(DROPBEAR_PRNGD_SOCKET)
190 #error "You must choose one of DROPBEAR_PRNGD_SOCKET or DROPBEAR_RANDOM_DEV in options.h"
191 #endif
192
193 /* We use dropbear_client and dropbear_server as shortcuts to avoid redundant 185 /* We use dropbear_client and dropbear_server as shortcuts to avoid redundant
194 * code, if we're just compiling as client or server */ 186 * code, if we're just compiling as client or server */
195 #if defined(DROPBEAR_SERVER) && defined(DROPBEAR_CLIENT) 187 #if defined(DROPBEAR_SERVER) && defined(DROPBEAR_CLIENT)
196 188
197 #define IS_DROPBEAR_SERVER (ses.isserver == 1) 189 #define IS_DROPBEAR_SERVER (ses.isserver == 1)