]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: ssl: Activate aes_gcm_dec converter for BoringSSL
authorEmmanuel Hocdet <manu@gandi.net>
Mon, 1 Apr 2019 16:24:38 +0000 (18:24 +0200)
committerWilly Tarreau <w@1wt.eu>
Thu, 11 Apr 2019 13:00:13 +0000 (15:00 +0200)
BoringSSL can support it, no need to disable.

src/ssl_sock.c

index e8265622ac2a078974a96a390f0b6e4841f5e07d..53d313251a63d5a6fe28f765bf34e09adc618165 100644 (file)
@@ -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 <const> 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 },