From cbe585dd874fcccdea97e94835198c449b39031f Mon Sep 17 00:00:00 2001 From: Xiaogrill Date: Sun, 11 Feb 2018 09:02:57 -0800 Subject: [PATCH] Treat LibreSSL as an older OpenSSL --- src/file_analysis/analyzer/x509/X509.h | 4 ++-- src/file_analysis/analyzer/x509/functions.bif | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/file_analysis/analyzer/x509/X509.h b/src/file_analysis/analyzer/x509/X509.h index 1e7cd05a62..8cf74fc4c6 100644 --- a/src/file_analysis/analyzer/x509/X509.h +++ b/src/file_analysis/analyzer/x509/X509.h @@ -8,13 +8,13 @@ #include "Val.h" #include "X509Common.h" -#if (OPENSSL_VERSION_NUMBER < 0x10002000L) +#if (OPENSSL_VERSION_NUMBER < 0x10002000L || LIBRESSL_VERSION_NUMBER) #define X509_get_signature_nid(x) OBJ_obj2nid((x)->sig_alg->algorithm) #endif -#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) +#if (OPENSSL_VERSION_NUMBER < 0x1010000fL || LIBRESSL_VERSION_NUMBER) #define X509_OBJECT_new() (X509_OBJECT*)malloc(sizeof(X509_OBJECT)) #define X509_OBJECT_free(a) free(a) diff --git a/src/file_analysis/analyzer/x509/functions.bif b/src/file_analysis/analyzer/x509/functions.bif index 6fdb695ce8..18f56758f5 100644 --- a/src/file_analysis/analyzer/x509/functions.bif +++ b/src/file_analysis/analyzer/x509/functions.bif @@ -668,7 +668,7 @@ function sct_verify%(cert: opaque of x509, logid: string, log_key: string, signa uint32 cert_length; if ( precert ) { -#if (OPENSSL_VERSION_NUMBER < 0x10002000L) +#if (OPENSSL_VERSION_NUMBER < 0x10002000L || LIBRESSL_VERSION_NUMBER) x->cert_info->enc.modified = 1; cert_length = i2d_X509_CINF(x->cert_info, &cert_out); #else