forked from Ivasoft/openwrt
openssl: config engines in /etc/ssl/engines.cnf.d
This changes the configuration of engines from the global openssl.cnf to files in the /etc/ssl/engines.cnf.d directory. The engines.cnf file has the list of enabled engines, while each engine has its own configuration file installed under /etc/ssl/engines.cnf.d. Patches were refreshed with --zero-commit. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
This commit is contained in:
committed by
Petr Štetiar
parent
aae7af4219
commit
17a6ca12d3
@@ -9,7 +9,6 @@ engines/e_devcrypto.c.
|
||||
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
|
||||
|
||||
diff --git a/crypto/engine/build.info b/crypto/engine/build.info
|
||||
index e00802a3fd..47fe948966 100644
|
||||
--- a/crypto/engine/build.info
|
||||
+++ b/crypto/engine/build.info
|
||||
@@ -6,6 +6,3 @@ SOURCE[../../libcrypto]=\
|
||||
@@ -20,7 +19,6 @@ index e00802a3fd..47fe948966 100644
|
||||
- SOURCE[../../libcrypto]=eng_devcrypto.c
|
||||
-ENDIF
|
||||
diff --git a/crypto/init.c b/crypto/init.c
|
||||
index 1b0d523bea..ee3e2eb075 100644
|
||||
--- a/crypto/init.c
|
||||
+++ b/crypto/init.c
|
||||
@@ -329,18 +329,6 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_openssl)
|
||||
@@ -86,7 +84,6 @@ index 1b0d523bea..ee3e2eb075 100644
|
||||
if ((opts & OPENSSL_INIT_ENGINE_PADLOCK)
|
||||
&& !RUN_ONCE(&engine_padlock, ossl_init_engine_padlock))
|
||||
diff --git a/engines/build.info b/engines/build.info
|
||||
index 1db771971c..33a25d7004 100644
|
||||
--- a/engines/build.info
|
||||
+++ b/engines/build.info
|
||||
@@ -11,6 +11,9 @@ IF[{- !$disabled{"engine"} -}]
|
||||
@@ -116,7 +113,6 @@ diff --git a/crypto/engine/eng_devcrypto.c b/engines/e_devcrypto.c
|
||||
similarity index 95%
|
||||
rename from crypto/engine/eng_devcrypto.c
|
||||
rename to engines/e_devcrypto.c
|
||||
index 2c1b52d572..eff1ed3a7d 100644
|
||||
--- a/crypto/engine/eng_devcrypto.c
|
||||
+++ b/engines/e_devcrypto.c
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
Reference in New Issue
Block a user