From 2b4edfb0bd5d39a1da36b10a4ce562c91d9e7b27 Mon Sep 17 00:00:00 2001 From: Emmanuel Hocdet Date: Mon, 1 Apr 2019 18:24:38 +0200 Subject: [PATCH] MINOR: ssl: Activate aes_gcm_dec converter for BoringSSL BoringSSL can support it, no need to disable. --- src/ssl_sock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ssl_sock.c b/src/ssl_sock.c index e8265622a..53d313251 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -72,7 +72,7 @@ #define X509_getm_notAfter X509_get_notAfter #endif -#if (OPENSSL_VERSION_NUMBER < 0x1010000fL && !defined OPENSSL_IS_BORINGSSL && !defined LIBRESSL_VERSION_NUMBER) +#if (OPENSSL_VERSION_NUMBER < 0x1010000fL && !defined LIBRESSL_VERSION_NUMBER) #define EVP_CTRL_AEAD_SET_IVLEN EVP_CTRL_GCM_SET_IVLEN #define EVP_CTRL_AEAD_SET_TAG EVP_CTRL_GCM_SET_TAG #endif @@ -9081,7 +9081,7 @@ static int cli_parse_set_ocspresponse(char **args, char *payload, struct appctx } -#if (OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined OPENSSL_IS_BORINGSSL && !defined LIBRESSL_VERSION_NUMBER) +#if (OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined LIBRESSL_VERSION_NUMBER) static inline int sample_conv_var2smp_str(const struct arg *arg, struct sample *smp) { switch (arg->type) { @@ -9478,7 +9478,7 @@ INITCALL1(STG_REGISTER, cfg_register_keywords, &cfg_kws); /* Note: must not be declared as its list will be overwritten */ static struct sample_conv_kw_list conv_kws = {ILH, { -#if (OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined OPENSSL_IS_BORINGSSL && !defined LIBRESSL_VERSION_NUMBER) +#if (OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined LIBRESSL_VERSION_NUMBER) { "aes_gcm_dec", sample_conv_aes_gcm_dec, ARG4(4,SINT,STR,STR,STR), check_aes_gcm, SMP_T_BIN, SMP_T_BIN }, #endif { NULL, NULL, 0, 0, 0 },