mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: ssl: add utils functions to extract X509 notAfter date

Browse Source 
Add ASN1_to_time_t() which converts an ASN1_TIME to a time_t and
x509_get_notafter_time_t() which returns the notAfter date in time_t
format.
This commit is contained in:
William Lallemand 2024-12-16 12:34:56 +01:00
parent fbc534a6fa
commit bb88f68cf7
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/haproxy/ssl_utils.h
View File

@ -47,6 +47,10 @@ const char *x509_v_err_int_to_str(int code);
long asn1_generalizedtime_to_epoch(ASN1_GENERALIZEDTIME *d); long asn1_generalizedtime_to_epoch(ASN1_GENERALIZEDTIME *d);
const char *x509_get_notbefore(X509 *cert); const char *x509_get_notbefore(X509 *cert);
const char *x509_get_notafter(X509 *cert); const char *x509_get_notafter(X509 *cert);
#ifdef HAVE_ASN1_TIME_TO_TM
time_t ASN1_to_time_t(ASN1_TIME *asn1_time);
time_t x509_get_notafter_time_t(X509 *cert);
#endif
#endif /* _HAPROXY_SSL_UTILS_H */ #endif /* _HAPROXY_SSL_UTILS_H */
#endif /* USE_OPENSSL */ #endif /* USE_OPENSSL */

30
src/ssl_utils.c
View File

@ -753,3 +753,33 @@ const char *x509_get_notbefore(X509 *cert)
return NULL; return NULL;
} }
#ifdef HAVE_ASN1_TIME_TO_TM
/* Takes a ASN1_TIME and converts it into a time_t */
time_t ASN1_to_time_t(ASN1_TIME *asn1_time)
{
struct tm tm;
time_t ret = -1;
if (ASN1_TIME_to_tm(asn1_time, &tm) == 0)
goto error;
ret = my_timegm(&tm);
error:
return ret;
}
/* return the notAfter date of a X509 certificate in a time_t format */
time_t x509_get_notafter_time_t(X509 *cert)
{
time_t ret = -1;
ASN1_TIME *asn1_time;
if ((asn1_time = X509_getm_notAfter(cert)) == NULL)
goto error;
ret = ASN1_to_time_t(asn1_time);
error:
return ret;
}
#endif