1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUILD/MINOR: ssl: Fix compilation with OpenSSL 1.0.2

Browse Source 
The following functions used in CA/CRL file hot update were not defined
in OpenSSL 1.0.2 so they need to be defined in openssl-compat :
- X509_CRL_get_signature_nid
- X509_CRL_get0_lastUpdate
- X509_CRL_get0_nextUpdate
- X509_REVOKED_get0_serialNumber
- X509_REVOKED_get0_revocationDate
This commit is contained in:
Remi Tricot-Le Breton 2021-05-17 18:38:34 +02:00 committed by William Lallemand
parent d75b99e69c
commit 18c7d83934
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/haproxy/openssl-compat.h
View File

@ -261,6 +261,31 @@ static inline void SSL_CTX_up_ref(SSL_CTX *ctx)
{ {
CRYPTO_add(&ctx->references, 1, CRYPTO_LOCK_SSL_CTX); CRYPTO_add(&ctx->references, 1, CRYPTO_LOCK_SSL_CTX);
} }
static inline int X509_CRL_get_signature_nid(const X509_CRL *crl)
{
return OBJ_obj2nid(crl->sig_alg->algorithm);
}
static inline const ASN1_TIME *X509_CRL_get0_lastUpdate(const X509_CRL *crl)
{
return X509_CRL_get_lastUpdate(crl);
}
static inline const ASN1_TIME *X509_CRL_get0_nextUpdate(const X509_CRL *crl)
{
return X509_CRL_get_nextUpdate(crl);
}
static inline const ASN1_INTEGER *X509_REVOKED_get0_serialNumber(const X509_REVOKED *x)
{
return x->serialNumber;
}
static inline const ASN1_TIME *X509_REVOKED_get0_revocationDate(const X509_REVOKED *x)
{
return x->revocationDate;
}
#endif #endif
#if (HA_OPENSSL_VERSION_NUMBER >= 0x1010000fL) || (LIBRESSL_VERSION_NUMBER >= 0x2070200fL) #if (HA_OPENSSL_VERSION_NUMBER >= 0x1010000fL) || (LIBRESSL_VERSION_NUMBER >= 0x2070200fL)

2
src/ssl_ckch.c
View File

@ -3327,7 +3327,7 @@ static int show_crl_detail(X509_CRL *crl, struct buffer *out)
if (BIO_reset(bio) == -1) if (BIO_reset(bio) == -1)
goto end; goto end;
BIO_printf(bio , " Serial Number: "); BIO_printf(bio , " Serial Number: ");
i2a_ASN1_INTEGER(bio, X509_REVOKED_get0_serialNumber(rev_entry)); i2a_ASN1_INTEGER(bio, (ASN1_INTEGER*)X509_REVOKED_get0_serialNumber(rev_entry));
BIO_printf(bio, "\n Revocation Date: "); BIO_printf(bio, "\n Revocation Date: ");
ASN1_TIME_print(bio, X509_REVOKED_get0_revocationDate(rev_entry)); ASN1_TIME_print(bio, X509_REVOKED_get0_revocationDate(rev_entry));
BIO_printf(bio, "\n"); BIO_printf(bio, "\n");