X-Git-Url: http://www.privoxy.org/gitweb/show-status?a=blobdiff_plain;f=ssl.c;h=0df73334cac6c7c3f568294ad812aadab6e1ca16;hb=87253c999d5628a6e9287bb0cc613d7b44bcec09;hp=186615477663fa49832248f78c3e588ab15ee0b1;hpb=babd5dc0098b2c1703e1c1395c5262ec293c283e;p=privoxy.git diff --git a/ssl.c b/ssl.c index 18661547..0df73334 100644 --- a/ssl.c +++ b/ssl.c @@ -325,17 +325,16 @@ extern int create_client_ssl_connection(struct client_state *csp) * certificate and key inconsistence must be locked. */ privoxy_mutex_lock(&certificate_mutex); - ret = generate_host_certificate(csp); + privoxy_mutex_unlock(&certificate_mutex); + if (ret < 0) { log_error(LOG_LEVEL_ERROR, "generate_host_certificate failed: %d", ret); - privoxy_mutex_unlock(&certificate_mutex); ret = -1; goto exit; } - privoxy_mutex_unlock(&certificate_mutex); /* * Seed the RNG @@ -1977,7 +1976,7 @@ static int *get_ciphersuites_from_string(const char *parameter_string) size_t parameter_len = strlen(parameter_string); ciphersuites_string = zalloc_or_die(parameter_len + 1); - strncpy(ciphersuites_string, parameter_string, parameter_len); + strlcpy(ciphersuites_string, parameter_string, parameter_len + 1); ciphersuites_index = ciphersuites_string; while (*ciphersuites_index)