From: Alberto Leiva Popper <ydahhrk@gmail.com>
Date: Mon, 6 May 2024 21:54:16 +0000 (-0600)
Subject: Fix compilation in OpenSSL < 3 and LibreSSL
X-Git-Tag: 1.6.2~29
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=fcb0b3c9a80e1ed54556b8cfb4ef34c0d330ff73;p=thirdparty%2FFORT-validator.git

Fix compilation in OpenSSL < 3 and LibreSSL
---

diff --git a/src/libcrypto_util.c b/src/libcrypto_util.c
index 462e79f3..82a68102 100644
--- a/src/libcrypto_util.c
+++ b/src/libcrypto_util.c
@@ -2,6 +2,7 @@
 
 #include <stdlib.h>
 #include <openssl/asn1.h>
+#include <openssl/opensslv.h>
 
 #include "alloc.h"
 #include "extension.h"
@@ -90,6 +91,7 @@ json_t *
 asn1time2json(ASN1_TIME const *time)
 {
 	BIO *bio;
+	int success;
 
 	if (time == NULL)
 		return json_null();
@@ -98,7 +100,12 @@ asn1time2json(ASN1_TIME const *time)
 	if (bio == NULL)
 		return NULL;
 
-	if (!ASN1_TIME_print_ex(bio, time, ASN1_DTFLGS_ISO8601)) {
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+	success = ASN1_TIME_print_ex(bio, time, ASN1_DTFLGS_ISO8601);
+#else
+	success = ASN1_TIME_print(bio, time); /* Kill me */
+#endif
+	if (!success) {
 		BIO_free_all(bio);
 		return NULL;
 	}
diff --git a/src/libcrypto_util.h b/src/libcrypto_util.h
index 53c9ba52..3e464f99 100644
--- a/src/libcrypto_util.h
+++ b/src/libcrypto_util.h
@@ -4,7 +4,7 @@
 #include <jansson.h>
 #include <openssl/asn1.h>
 #include <openssl/bio.h>
-#include <openssl/x509.h>
+#include <openssl/x509v3.h>
 
 char *bio2str(BIO *);
 json_t *bio2json(BIO *);