X-Git-Url: http://www.privoxy.org/gitweb/show-status?a=blobdiff_plain;f=ssl.c;h=0df73334cac6c7c3f568294ad812aadab6e1ca16;hb=8d1b6e2366d27b304cb53bc2f8370365473b269c;hp=e07397f9dd486a809d5af528cd215baf92ac4fac;hpb=85bc700695d99d5858dbaa1448251e48df9ce747;p=privoxy.git diff --git a/ssl.c b/ssl.c index e07397f9..0df73334 100644 --- a/ssl.c +++ b/ssl.c @@ -7,7 +7,7 @@ * using mbedTLS. * * Copyright : Written by and Copyright (c) 2017-2020 Vaclav Svec. FIT CVUT. - * Copyright (C) 2018-2020 by Fabian Keil + * Copyright (C) 2018-2021 by Fabian Keil * * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General @@ -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)