projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
58a71f0
)
generate_certificate_valid_date(): Use privoxy_gmtime_r()
author
Fabian Keil
<fk@fabiankeil.de>
Sun, 7 Jun 2020 15:48:52 +0000
(17:48 +0200)
committer
Fabian Keil
<fk@fabiankeil.de>
Mon, 8 Jun 2020 13:34:36 +0000
(15:34 +0200)
ssl.c
patch
|
blob
|
history
diff --git
a/ssl.c
b/ssl.c
index
acd9f90
..
313174f
100644
(file)
--- a/
ssl.c
+++ b/
ssl.c
@@
-1336,33
+1336,17
@@
static int ssl_certificate_is_invalid(const char *cert_file)
static int generate_certificate_valid_date(time_t time_spec, char *buffer,
size_t buffer_size)
{
static int generate_certificate_valid_date(time_t time_spec, char *buffer,
size_t buffer_size)
{
-#ifdef HAVE_GMTIME_R
struct tm valid_date;
struct tm valid_date;
-#endif
struct tm *timeptr;
size_t ret;
struct tm *timeptr;
size_t ret;
-#ifdef HAVE_GMTIME_R
- timeptr = gmtime_r(&time_spec, &valid_date);
-#elif defined(MUTEX_LOCKS_AVAILABLE)
- privoxy_mutex_lock(&gmtime_mutex);
- timeptr = gmtime(&time_spec);
-#else
-#warning Using unlocked gmtime()
- timeptr = gmtime(&time_spec);
-#endif
+ timeptr = privoxy_gmtime_r(&time_spec, &valid_date);
if (NULL == timeptr)
{
if (NULL == timeptr)
{
-#if !defined(HAVE_GMTIME_R) && defined(MUTEX_LOCKS_AVAILABLE)
- privoxy_mutex_unlock(&gmtime_mutex);
-#endif
return 1;
}
ret = strftime(buffer, buffer_size, "%Y%m%d%H%M%S", timeptr);
return 1;
}
ret = strftime(buffer, buffer_size, "%Y%m%d%H%M%S", timeptr);
-#if !defined(HAVE_GMTIME_R) && defined(MUTEX_LOCKS_AVAILABLE)
- privoxy_mutex_unlock(&gmtime_mutex);
-#endif
if (ret != 14)
{
return 1;
if (ret != 14)
{
return 1;