strongswan: update to 5.8.1
[openadk.git] / package / strongswan / patches / patch-src_libstrongswan_plugins_openssl_openssl_plugin_c
blob2c88daa81d1e2a3f6c8dd3dbad47fe0e372a2bfb
1 --- strongswan-5.8.1.orig/src/libstrongswan/plugins/openssl/openssl_plugin.c    2019-08-27 15:26:53.000000000 +0200
2 +++ strongswan-5.8.1/src/libstrongswan/plugins/openssl/openssl_plugin.c 2019-10-08 02:05:20.954742229 +0200
3 @@ -310,7 +310,7 @@ static private_key_t *openssl_private_ke
4                                 case EVP_PKEY_EC:
5                                         return openssl_ec_private_key_create(key, FALSE);
6  #endif
7 -#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC)
8 +#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) && !defined(LIBRESSL_VERSION_NUMBER)
9                                 case EVP_PKEY_ED25519:
10                                 case EVP_PKEY_ED448:
11                                         return openssl_ed_private_key_create(key, FALSE);
12 @@ -462,7 +462,7 @@ static private_key_t *openssl_private_ke
13                 case EVP_PKEY_EC:
14                         return openssl_ec_private_key_create(key, TRUE);
15  #endif
16 -#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC)
17 +#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) && !defined(LIBRESSL_VERSION_NUMBER)
18                 case EVP_PKEY_ED25519:
19                 case EVP_PKEY_ED448:
20                         return openssl_ed_private_key_create(key, TRUE);
21 @@ -814,7 +814,7 @@ plugin_t *openssl_plugin_create()
22                 },
23         );
25 -#if OPENSSL_VERSION_NUMBER >= 0x10100000L
26 +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
27         /* note that we can't call OPENSSL_cleanup() when the plugin is destroyed
28          * as we couldn't initialize the library again afterwards */
29         OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG |