X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcrypto.c;h=fb5f7a7140ca811be46f2a203d0bdc3b0a95aec9;hb=4a15af614c3957ed5f7092c27cd0cb954c725eac;hp=eadfbc9bc5fd778aacdaa296473c0a2e3f67526f;hpb=bc94b116623bb7867659164e1b88b1aa1bbdd90b;p=citadel.git diff --git a/webcit/crypto.c b/webcit/crypto.c index eadfbc9bc..fb5f7a714 100644 --- a/webcit/crypto.c +++ b/webcit/crypto.c @@ -59,7 +59,7 @@ void generate_key(char *keyfilename) unsigned long e = RSA_F4; FILE *fp; - if (access(file_crpt_file_key, R_OK) == 0) { + if (access(keyfilename, R_OK) == 0) { return; } @@ -91,7 +91,7 @@ void generate_key(char *keyfilename) NULL /* no callbk */ ) != 1) { syslog(LOG_ERR, "crypto: cannot write key: %s", ERR_reason_error_string(ERR_get_error())); - unlink(file_crpt_file_key); + unlink(keyfilename); } fclose(fp); } @@ -397,10 +397,8 @@ void init_ssl(void) SSL_CTX_use_certificate_chain_file(ssl_ctx, CTDL_CER_PATH); SSL_CTX_use_PrivateKey_file(ssl_ctx, CTDL_KEY_PATH, SSL_FILETYPE_PEM); if ( !SSL_CTX_check_private_key(ssl_ctx) ) { - syslog(LOG_WARNING, "Cannot install certificate: %s\n", - ERR_reason_error_string(ERR_get_error())); + syslog(LOG_WARNING, "crypto: cannot install certificate: %s\n", ERR_reason_error_string(ERR_get_error())); } - }