Allow OpenSSL recognize SSL_CONF_cmd options (#150)

oToToT · web-flow · commit a7150a1607d2 · 2021-05-28T14:51:35.000+08:00
https://www.openssl.org/docs/manmaster/man3/SSL_CONF_CTX_set_flags.html and https://www.openssl.org/docs/manmaster/man3/SSL_CONF_cmd.html for more detail.
diff --git a/trantor/net/inner/TcpConnectionImpl.cc b/trantor/net/inner/TcpConnectionImpl.cc
@@ -208,8 +208,9 @@ class SSLContext
         SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_SERVER);
         SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CLIENT);
         SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CERTIFICATE);
+        SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_FILE);
         SSL_CONF_CTX_set_ssl_ctx(cctx, ctxPtr_);
-        for (auto cmd : sslConfCmds)
+        for (const auto &cmd : sslConfCmds)
         {
             SSL_CONF_cmd(cctx, cmd.first.data(), cmd.second.data());
         }
@@ -230,8 +231,9 @@ class SSLContext
         SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_SERVER);
         SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CLIENT);
         SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CERTIFICATE);
+        SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_FILE);
         SSL_CONF_CTX_set_ssl_ctx(cctx, ctxPtr_);
-        for (auto cmd : sslConfCmds)
+        for (const auto &cmd : sslConfCmds)
         {
             SSL_CONF_cmd(cctx, cmd.first.data(), cmd.second.data());
         }

Original file line number	Diff line number	Diff line change
`@@ -208,8 +208,9 @@ class SSLContext`
`208`	`208`	`SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_SERVER);`
`209`	`209`	`SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CLIENT);`
`210`	`210`	`SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CERTIFICATE);`
	`211`	`+ SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_FILE);`
`211`	`212`	`SSL_CONF_CTX_set_ssl_ctx(cctx, ctxPtr_);`
`212`		`- for (auto cmd : sslConfCmds)`
	`213`	`+ for (const auto &cmd : sslConfCmds)`
`213`	`214`	`{`
`214`	`215`	`SSL_CONF_cmd(cctx, cmd.first.data(), cmd.second.data());`
`215`	`216`	`}`
`@@ -230,8 +231,9 @@ class SSLContext`
`230`	`231`	`SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_SERVER);`
`231`	`232`	`SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CLIENT);`
`232`	`233`	`SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CERTIFICATE);`
	`234`	`+ SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_FILE);`
`233`	`235`	`SSL_CONF_CTX_set_ssl_ctx(cctx, ctxPtr_);`
`234`		`- for (auto cmd : sslConfCmds)`
	`236`	`+ for (const auto &cmd : sslConfCmds)`
`235`	`237`	`{`
`236`	`238`	`SSL_CONF_cmd(cctx, cmd.first.data(), cmd.second.data());`
`237`	`239`	`}`