diff options
Diffstat (limited to 'src/libstrongswan/plugins/openssl')
| -rw-r--r-- | src/libstrongswan/plugins/openssl/Makefile.in | 2 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/libstrongswan/plugins/openssl/Makefile.in b/src/libstrongswan/plugins/openssl/Makefile.in index dd8a17ed7..798ee5f26 100644 --- a/src/libstrongswan/plugins/openssl/Makefile.in +++ b/src/libstrongswan/plugins/openssl/Makefile.in @@ -367,7 +367,6 @@ exec_prefix = @exec_prefix@ fips_mode = @fips_mode@ gtk_CFLAGS = @gtk_CFLAGS@ gtk_LIBS = @gtk_LIBS@ -h_plugins = @h_plugins@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -402,6 +401,7 @@ nm_LIBS = @nm_LIBS@ nm_ca_dir = @nm_ca_dir@ nm_plugins = @nm_plugins@ oldincludedir = @oldincludedir@ +p_plugins = @p_plugins@ pcsclite_CFLAGS = @pcsclite_CFLAGS@ pcsclite_LIBS = @pcsclite_LIBS@ pdfdir = @pdfdir@ diff --git a/src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c b/src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c index 11d6e8ec5..11185e0c7 100644 --- a/src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c +++ b/src/libstrongswan/plugins/openssl/openssl_ec_diffie_hellman.c @@ -327,9 +327,12 @@ METHOD(diffie_hellman_t, destroy, void, /** * ECC Brainpool curves are not available in OpenSSL releases < 1.0.2, but we * don't check the version in case somebody backported them. + * + * BoringSSL defines the constants but not the curves. */ #if (!defined(NID_brainpoolP224r1) || !defined(NID_brainpoolP256r1) || \ - !defined(NID_brainpoolP384r1) || !defined(NID_brainpoolP512r1)) + !defined(NID_brainpoolP384r1) || !defined(NID_brainpoolP512r1) || \ + defined(OPENSSL_IS_BORINGSSL)) /** * Parameters for ECC Brainpool curves |