--- embedaddon/strongswan/src/libstrongswan/plugins/openssl/openssl_plugin.c	2020/06/03 09:46:44	1.1.1.1
+++ embedaddon/strongswan/src/libstrongswan/plugins/openssl/openssl_plugin.c	2021/03/17 00:20:08	1.1.1.2
@@ -75,7 +75,7 @@ struct private_openssl_plugin_t {
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 
 /**
- * Array of static mutexs, with CRYPTO_num_locks() mutex
+ * Array of static mutexes, with CRYPTO_num_locks() mutex
  */
 static mutex_t **mutex = NULL;
 
@@ -737,12 +737,14 @@ METHOD(plugin_t, get_features, int,
 		PLUGIN_PROVIDE(PUBKEY_VERIFY, SIGN_ECDSA_521),
 #endif
 #endif /* OPENSSL_NO_ECDSA */
-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC)
+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_ECDH)
 		PLUGIN_REGISTER(DH, openssl_x_diffie_hellman_create),
 			/* available since 1.1.0a, but we require 1.1.1 features */
 			PLUGIN_PROVIDE(DH, CURVE_25519),
 			/* available since 1.1.1 */
 			PLUGIN_PROVIDE(DH, CURVE_448),
+#endif /* OPENSSL_VERSION_NUMBER && !OPENSSL_NO_ECDH */
+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC)
 		/* EdDSA private/public key loading */
 		PLUGIN_REGISTER(PUBKEY, openssl_ed_public_key_load, TRUE),
 			PLUGIN_PROVIDE(PUBKEY, KEY_ED25519),