privoxy_mutex_t log_init_mutex;
privoxy_mutex_t connection_reuse_mutex;
-#ifdef LIMIT_MUTEX_NUMBER
-privoxy_mutex_t certificates_mutexes[32];
-#else
-privoxy_mutex_t certificates_mutexes[65536];
-#endif /* LIMIT_MUTEX_NUMBER */
+privoxy_mutex_t certificate_mutex;
privoxy_mutex_t rng_mutex;
#ifdef FEATURE_EXTERNAL_FILTERS
* Prepare global mutex semaphores
*/
-#ifdef LIMIT_MUTEX_NUMBER
- int i = 0;
- for (i = 0; i < 32; i++)
-#else
- int i = 0;
- for (i = 0; i < 65536; i++)
-#endif /* LIMIT_MUTEX_NUMBER */
- {
- privoxy_mutex_init(&(certificates_mutexes[i]));
- }
+ privoxy_mutex_init(&certificate_mutex);
privoxy_mutex_init(&rng_mutex);
privoxy_mutex_init(&log_mutex);
extern privoxy_mutex_t rand_mutex;
#endif /* ndef HAVE_RANDOM */
-#ifdef LIMIT_MUTEX_NUMBER
-extern privoxy_mutex_t certificates_mutexes[32];
-#else
-extern privoxy_mutex_t certificates_mutexes[65536];
-#endif /* LIMIT_MUTEX_NUMBER */
+extern privoxy_mutex_t certificate_mutex;
extern privoxy_mutex_t rng_mutex;
#endif /* FEATURE_PTHREAD */
static int host_to_hash(struct client_state *csp);
static int ssl_verify_callback(void *data, mbedtls_x509_crt *crt, int depth, uint32_t *flags);
static void free_certificate_chain(struct client_state *csp);
-static unsigned int get_certificate_mutex_id(struct client_state *csp);
static unsigned long get_certificate_serial(struct client_state *csp);
static void free_client_ssl_structures(struct client_state *csp);
static void free_server_ssl_structures(struct client_state *csp);
* Generating certificate for requested host. Mutex to prevent
* certificate and key inconsistence must be locked.
*/
- unsigned int cert_mutex_id = get_certificate_mutex_id(csp);
- privoxy_mutex_lock(&(certificates_mutexes[cert_mutex_id]));
+ privoxy_mutex_lock(&certificate_mutex);
ret = generate_webpage_certificate(csp);
if (ret < 0)
{
log_error(LOG_LEVEL_ERROR,
"Generate_webpage_certificate failed: %d", ret);
- privoxy_mutex_unlock(&(certificates_mutexes[cert_mutex_id]));
+ privoxy_mutex_unlock(&certificate_mutex);
ret = -1;
goto exit;
}
- privoxy_mutex_unlock(&(certificates_mutexes[cert_mutex_id]));
+ privoxy_mutex_unlock(&certificate_mutex);
/*
* Seed the RNG
}
-/*********************************************************************
- *
- * Function : get_certificate_mutex_id
- *
- * Description : Computes mutex id from host name hash. This hash must
- * be already saved in csp structure
- *
- * Parameters :
- * 1 : csp = Current client state (buffers, headers, etc...)
- *
- * Returns : Mutex id for given host name
- *
- *********************************************************************/
-static unsigned int get_certificate_mutex_id(struct client_state *csp) {
-#ifdef LIMIT_MUTEX_NUMBER
- return (unsigned int)(csp->http->hash_of_host[0] % 32);
-#else
- return (unsigned int)(csp->http->hash_of_host[1]
- + 256 * (int)csp->http->hash_of_host[0]);
-#endif /* LIMIT_MUTEX_NUMBER */
-}
-
-
/*********************************************************************
*
* Function : get_certificate_serial