projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
privoxy-log-parser: Bump copyright
[privoxy.git]
/
ssl.c
diff --git
a/ssl.c
b/ssl.c
index
1866154
..
0df7333
100644
(file)
--- 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);
* certificate and key inconsistence must be locked.
*/
privoxy_mutex_lock(&certificate_mutex);
-
ret = generate_host_certificate(csp);
ret = generate_host_certificate(csp);
+ privoxy_mutex_unlock(&certificate_mutex);
+
if (ret < 0)
{
log_error(LOG_LEVEL_ERROR,
"generate_host_certificate failed: %d", ret);
if (ret < 0)
{
log_error(LOG_LEVEL_ERROR,
"generate_host_certificate failed: %d", ret);
- privoxy_mutex_unlock(&certificate_mutex);
ret = -1;
goto exit;
}
ret = -1;
goto exit;
}
- privoxy_mutex_unlock(&certificate_mutex);
/*
* Seed the RNG
/*
* 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);
size_t parameter_len = strlen(parameter_string);
ciphersuites_string = zalloc_or_die(parameter_len + 1);
- str
ncpy(ciphersuites_string, parameter_string, parameter_len
);
+ str
lcpy(ciphersuites_string, parameter_string, parameter_len + 1
);
ciphersuites_index = ciphersuites_string;
while (*ciphersuites_index)
ciphersuites_index = ciphersuites_string;
while (*ciphersuites_index)