albino/ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configtest: complain when ssl keys are not readable

Browse Source
This commit is contained in:
Florian Westphal 2009-09-20 20:43:12 +02:00
parent 5b1efaee67
commit affa03b277
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/ngircd/conf.c
View File

@ -95,19 +95,42 @@ ConfSSL_Init(void)
array_free_wipe(&Conf_SSLOptions.KeyFilePassword); array_free_wipe(&Conf_SSLOptions.KeyFilePassword);
} }
static bool
can_open(const char *name, const char *file)
{
FILE *fp = fopen(file, "r");
if (fp)
fclose(fp);
else
fprintf(stderr, "ERROR: %s \"%s\": %s\n",
name, file, strerror(errno));
return fp != NULL;
}
static void static bool
ConfSSL_Puts(void) ConfSSL_Puts(void)
{ {
if (Conf_SSLOptions.KeyFile) bool ret = true;
if (Conf_SSLOptions.KeyFile) {
printf( " SSLKeyFile = %s\n", Conf_SSLOptions.KeyFile); printf( " SSLKeyFile = %s\n", Conf_SSLOptions.KeyFile);
if (Conf_SSLOptions.CertFile) ret = can_open("SSLKeyFile", Conf_SSLOptions.KeyFile);
}
if (Conf_SSLOptions.CertFile) {
printf( " SSLCertFile = %s\n", Conf_SSLOptions.CertFile); printf( " SSLCertFile = %s\n", Conf_SSLOptions.CertFile);
if (Conf_SSLOptions.DHFile) if (!can_open("SSLCertFile", Conf_SSLOptions.CertFile))
ret = false;
}
if (Conf_SSLOptions.DHFile) {
printf( " SSLDHFile = %s\n", Conf_SSLOptions.DHFile); printf( " SSLDHFile = %s\n", Conf_SSLOptions.DHFile);
if (!can_open("SSLDHFile", Conf_SSLOptions.DHFile))
ret = false;
}
if (array_bytes(&Conf_SSLOptions.KeyFilePassword)) if (array_bytes(&Conf_SSLOptions.KeyFilePassword))
puts(" SSLKeyFilePassword = <secret>" ); puts(" SSLKeyFilePassword = <secret>" );
array_free_wipe(&Conf_SSLOptions.KeyFilePassword); array_free_wipe(&Conf_SSLOptions.KeyFilePassword);
return ret;
} }
#endif #endif
@ -245,7 +268,8 @@ Conf_Test( void )
#ifdef SSL_SUPPORT #ifdef SSL_SUPPORT
fputs(" SSLPorts = ", stdout); fputs(" SSLPorts = ", stdout);
ports_puts(&Conf_SSLOptions.ListenPorts); ports_puts(&Conf_SSLOptions.ListenPorts);
ConfSSL_Puts(); if (!ConfSSL_Puts())
config_valid = false;
#endif #endif
pwd = getpwuid( Conf_UID ); pwd = getpwuid( Conf_UID );