X-Git-Url: http://www.privoxy.org/gitweb/templates.html?a=blobdiff_plain;f=openssl.c;h=39f465310a07ba4e0cfadf167cccdc22bcdcb0d8;hb=e917ae3908064b70cca0e0e57b2c043d572306b8;hp=fca231060ddabe65f08074d53389d9964e3684b9;hpb=b574731be3564ad383b96642877ee66c7e7917fb;p=privoxy.git diff --git a/openssl.c b/openssl.c index fca23106..39f46531 100644 --- a/openssl.c +++ b/openssl.c @@ -8,7 +8,7 @@ * * Copyright : Written by and Copyright (c) 2020 Maxim Antonov * Copyright (C) 2017 Vaclav Svec. FIT CVUT. - * Copyright (C) 2018-2020 by Fabian Keil + * Copyright (C) 2018-2022 by Fabian Keil * * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General @@ -38,6 +38,13 @@ #include #include #include +#ifdef _WIN32 +/* https://www.openssl.org/docs/faq.html + I’ve compiled a program under Windows and it crashes: Why? + tl,dr: because it needs this include: +*/ +#include +#endif /* _WIN32 */ #include "config.h" #include "project.h" @@ -790,17 +797,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); + "generate_host_certificate() failed: %d", ret); ret = -1; goto exit; } - privoxy_mutex_unlock(&certificate_mutex); if (!(ssl_attr->openssl_attr.ctx = SSL_CTX_new(SSLv23_server_method()))) {