diff options
| author | Jim Jagielski <jim@apache.org> | 2018-04-09 15:39:10 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2018-04-09 15:39:10 +0000 |
| commit | d4caa929db17d9b965f2b020e13eeb1191b728e7 (patch) | |
| tree | 0aded6a6d75c7b3a3023a582e3c60e603202e4b7 /modules/md/md_crypt.c | |
| parent | 2a4c6d8942d2ec90fe5ca555d2af71434bbc001b (diff) | |
| download | httpd-d4caa929db17d9b965f2b020e13eeb1191b728e7.tar.gz | |
Merge r1826973 from trunk:
mod_md: Fix compilation with OpenSSL before version 1.0.2.
Symbol ASN1_TIME_diff is only available for 1.0.2+,
but luckily alternative code we can use is already
available, originally written for the LibreSSL case.
Submitted by: rjung
Reviewed by: rjung, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828741 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/md/md_crypt.c')
| -rw-r--r-- | modules/md/md_crypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/md/md_crypt.c b/modules/md/md_crypt.c index 66682eaf4d..3651256cf0 100644 --- a/modules/md/md_crypt.c +++ b/modules/md/md_crypt.c @@ -190,7 +190,7 @@ static int pem_passwd(char *buf, int size, int rwflag, void *baton) */ static apr_time_t md_asn1_time_get(const ASN1_TIME* time) { -#ifdef LIBRESSL_VERSION_NUMBER +#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) /* courtesy: https://stackoverflow.com/questions/10975542/asn1-time-to-time-t-conversion#11263731 * all bugs are mine */ apr_time_exp_t t; |