Fix build error about ngx_ssl_certificate. (#1731)

jiuzhoucui · web-flow · commit aaaf7f27d1e3 · 2023-02-03T23:06:37.000+08:00
#1730
diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c
@@ -5015,8 +5015,10 @@ ngx_http_grpc_set_ssl(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *glcf)
             return NGX_ERROR;
         }
 
-        if (ngx_ssl_certificate(cf, glcf->upstream.ssl, &glcf->enc_certificate,
-                                &glcf->enc_certificate_key, glcf->ssl_passwords,
+        if (ngx_ssl_certificate(cf, glcf->upstream.ssl,
+                                &glcf->upstream.ssl_certificate->value,
+                                &glcf->upstream.ssl_certificate_key->value,
+                                glcf->upstream.ssl_passwords,
                                 SSL_ENC_CERT)
             != NGX_OK)
         {
@@ -5033,8 +5035,10 @@ ngx_http_grpc_set_ssl(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *glcf)
             return NGX_ERROR;
         }
 
-        if (ngx_ssl_certificate(cf, glcf->upstream.ssl, &glcf->sign_certificate,
-                                &glcf->sign_certificate_key, glcf->ssl_passwords,
+        if (ngx_ssl_certificate(cf, glcf->upstream.ssl,
+                                &glcf->upstream.ssl_certificate->value,
+                                &glcf->upstream.ssl_certificate_key->value,
+                                glcf->upstream.ssl_passwords,
                                 SSL_SIGN_CERT)
             != NGX_OK)
         {
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
@@ -5072,8 +5072,10 @@ ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf)
             return NGX_ERROR;
         }
 
-        if (ngx_ssl_certificate(cf, plcf->upstream.ssl, &plcf->enc_certificate,
-                                &plcf->enc_certificate_key, plcf->ssl_passwords,
+        if (ngx_ssl_certificate(cf, plcf->upstream.ssl,
+                                &plcf->upstream.ssl_certificate->value,
+                                &plcf->upstream.ssl_certificate_key->value,
+                                plcf->upstream.ssl_passwords,
                                 SSL_ENC_CERT)
             != NGX_OK)
         {
@@ -5090,8 +5092,10 @@ ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf)
             return NGX_ERROR;
         }
 
-        if (ngx_ssl_certificate(cf, plcf->upstream.ssl, &plcf->sign_certificate,
-                                &plcf->sign_certificate_key, plcf->ssl_passwords,
+        if (ngx_ssl_certificate(cf, plcf->upstream.ssl,
+                                &plcf->upstream.ssl_certificate->value,
+                                &plcf->upstream.ssl_certificate_key->value,
+                                plcf->upstream.ssl_passwords,
                                 SSL_SIGN_CERT)
             != NGX_OK)
         {
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
@@ -2559,8 +2559,10 @@ ngx_http_uwsgi_set_ssl(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *uwcf)
             return NGX_ERROR;
         }
 
-        if (ngx_ssl_certificate(cf, uwcf->upstream.ssl, &uwcf->enc_certificate,
-                                &uwcf->enc_certificate_key, uwcf->ssl_passwords,
+        if (ngx_ssl_certificate(cf, uwcf->upstream.ssl,
+                                &uwcf->upstream.ssl_certificate->value,
+                                &uwcf->upstream.ssl_certificate_key->value,
+                                uwcf->upstream.ssl_passwords,
                                 SSL_ENC_CERT)
             != NGX_OK)
         {
@@ -2577,8 +2579,10 @@ ngx_http_uwsgi_set_ssl(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *uwcf)
             return NGX_ERROR;
         }
 
-        if (ngx_ssl_certificate(cf, uwcf->upstream.ssl, &uwcf->sign_certificate,
-                                &uwcf->sign_certificate_key, uwcf->ssl_passwords,
+        if (ngx_ssl_certificate(cf, uwcf->upstream.ssl,
+                                &uwcf->upstream.ssl_certificate->value,
+                                &uwcf->upstream.ssl_certificate_key->value,
+                                uwcf->upstream.ssl_passwords,
                                 SSL_SIGN_CERT)
             != NGX_OK)
         {
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
@@ -2334,6 +2334,7 @@ ngx_stream_proxy_set_ssl(ngx_conf_t *cf, ngx_stream_proxy_srv_conf_t *pscf)
             if (ngx_ssl_certificate(cf, pscf->ssl,
                                     &pscf->ssl_certificate->value,
                                     &pscf->ssl_certificate_key->value,
+                                    pscf->ssl_passwords,
                                     SSL_NORMAL_CERT)
 #else
             if (ngx_ssl_certificate(cf, pscf->ssl,
@@ -2359,8 +2360,10 @@ ngx_stream_proxy_set_ssl(ngx_conf_t *cf, ngx_stream_proxy_srv_conf_t *pscf)
             return NGX_ERROR;
         }
 
-        if (ngx_ssl_certificate(cf, pscf->ssl, &pscf->enc_certificate,
-                                &pscf->enc_certificate_key, pscf->ssl_passwords,
+        if (ngx_ssl_certificate(cf, pscf->ssl,
+                                &pscf->ssl_certificate->value,
+                                &pscf->ssl_certificate_key->value,
+                                pscf->ssl_passwords,
                                 SSL_ENC_CERT)
             != NGX_OK)
         {
@@ -2377,8 +2380,10 @@ ngx_stream_proxy_set_ssl(ngx_conf_t *cf, ngx_stream_proxy_srv_conf_t *pscf)
             return NGX_ERROR;
         }
 
-        if (ngx_ssl_certificate(cf, pscf->ssl, &pscf->sign_certificate,
-                                &pscf->sign_certificate_key, pscf->ssl_passwords,
+        if (ngx_ssl_certificate(cf, pscf->ssl,
+                                &pscf->ssl_certificate->value,
+                                &pscf->ssl_certificate_key->value,
+                                pscf->ssl_passwords,
                                 SSL_SIGN_CERT)
             != NGX_OK)
         {

Original file line number	Diff line number	Diff line change
`@@ -5015,8 +5015,10 @@ ngx_http_grpc_set_ssl(ngx_conf_t cf, ngx_http_grpc_loc_conf_t glcf)`
`5015`	`5015`	`return NGX_ERROR;`
`5016`	`5016`	`}`
`5017`	`5017`
`5018`		`- if (ngx_ssl_certificate(cf, glcf->upstream.ssl, &glcf->enc_certificate,`
`5019`		`- &glcf->enc_certificate_key, glcf->ssl_passwords,`
	`5018`	`+ if (ngx_ssl_certificate(cf, glcf->upstream.ssl,`
	`5019`	`+ &glcf->upstream.ssl_certificate->value,`
	`5020`	`+ &glcf->upstream.ssl_certificate_key->value,`
	`5021`	`+ glcf->upstream.ssl_passwords,`
`5020`	`5022`	`SSL_ENC_CERT)`
`5021`	`5023`	`!= NGX_OK)`
`5022`	`5024`	`{`
`@@ -5033,8 +5035,10 @@ ngx_http_grpc_set_ssl(ngx_conf_t cf, ngx_http_grpc_loc_conf_t glcf)`
`5033`	`5035`	`return NGX_ERROR;`
`5034`	`5036`	`}`
`5035`	`5037`
`5036`		`- if (ngx_ssl_certificate(cf, glcf->upstream.ssl, &glcf->sign_certificate,`
`5037`		`- &glcf->sign_certificate_key, glcf->ssl_passwords,`
	`5038`	`+ if (ngx_ssl_certificate(cf, glcf->upstream.ssl,`
	`5039`	`+ &glcf->upstream.ssl_certificate->value,`
	`5040`	`+ &glcf->upstream.ssl_certificate_key->value,`
	`5041`	`+ glcf->upstream.ssl_passwords,`
`5038`	`5042`	`SSL_SIGN_CERT)`
`5039`	`5043`	`!= NGX_OK)`
`5040`	`5044`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5072,8 +5072,10 @@ ngx_http_proxy_set_ssl(ngx_conf_t cf, ngx_http_proxy_loc_conf_t plcf)`
`5072`	`5072`	`return NGX_ERROR;`
`5073`	`5073`	`}`
`5074`	`5074`
`5075`		`- if (ngx_ssl_certificate(cf, plcf->upstream.ssl, &plcf->enc_certificate,`
`5076`		`- &plcf->enc_certificate_key, plcf->ssl_passwords,`
	`5075`	`+ if (ngx_ssl_certificate(cf, plcf->upstream.ssl,`
	`5076`	`+ &plcf->upstream.ssl_certificate->value,`
	`5077`	`+ &plcf->upstream.ssl_certificate_key->value,`
	`5078`	`+ plcf->upstream.ssl_passwords,`
`5077`	`5079`	`SSL_ENC_CERT)`
`5078`	`5080`	`!= NGX_OK)`
`5079`	`5081`	`{`
`@@ -5090,8 +5092,10 @@ ngx_http_proxy_set_ssl(ngx_conf_t cf, ngx_http_proxy_loc_conf_t plcf)`
`5090`	`5092`	`return NGX_ERROR;`
`5091`	`5093`	`}`
`5092`	`5094`
`5093`		`- if (ngx_ssl_certificate(cf, plcf->upstream.ssl, &plcf->sign_certificate,`
`5094`		`- &plcf->sign_certificate_key, plcf->ssl_passwords,`
	`5095`	`+ if (ngx_ssl_certificate(cf, plcf->upstream.ssl,`
	`5096`	`+ &plcf->upstream.ssl_certificate->value,`
	`5097`	`+ &plcf->upstream.ssl_certificate_key->value,`
	`5098`	`+ plcf->upstream.ssl_passwords,`
`5095`	`5099`	`SSL_SIGN_CERT)`
`5096`	`5100`	`!= NGX_OK)`
`5097`	`5101`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2559,8 +2559,10 @@ ngx_http_uwsgi_set_ssl(ngx_conf_t cf, ngx_http_uwsgi_loc_conf_t uwcf)`
`2559`	`2559`	`return NGX_ERROR;`
`2560`	`2560`	`}`
`2561`	`2561`
`2562`		`- if (ngx_ssl_certificate(cf, uwcf->upstream.ssl, &uwcf->enc_certificate,`
`2563`		`- &uwcf->enc_certificate_key, uwcf->ssl_passwords,`
	`2562`	`+ if (ngx_ssl_certificate(cf, uwcf->upstream.ssl,`
	`2563`	`+ &uwcf->upstream.ssl_certificate->value,`
	`2564`	`+ &uwcf->upstream.ssl_certificate_key->value,`
	`2565`	`+ uwcf->upstream.ssl_passwords,`
`2564`	`2566`	`SSL_ENC_CERT)`
`2565`	`2567`	`!= NGX_OK)`
`2566`	`2568`	`{`
`@@ -2577,8 +2579,10 @@ ngx_http_uwsgi_set_ssl(ngx_conf_t cf, ngx_http_uwsgi_loc_conf_t uwcf)`
`2577`	`2579`	`return NGX_ERROR;`
`2578`	`2580`	`}`
`2579`	`2581`
`2580`		`- if (ngx_ssl_certificate(cf, uwcf->upstream.ssl, &uwcf->sign_certificate,`
`2581`		`- &uwcf->sign_certificate_key, uwcf->ssl_passwords,`
	`2582`	`+ if (ngx_ssl_certificate(cf, uwcf->upstream.ssl,`
	`2583`	`+ &uwcf->upstream.ssl_certificate->value,`
	`2584`	`+ &uwcf->upstream.ssl_certificate_key->value,`
	`2585`	`+ uwcf->upstream.ssl_passwords,`
`2582`	`2586`	`SSL_SIGN_CERT)`
`2583`	`2587`	`!= NGX_OK)`
`2584`	`2588`	`{`