bugfix: we didn't exclude the ssl_verify_callback when compiling with LibreSSL (#1894)

spacewander · web-flow · commit bdd48a154c9b · 2021-06-27T12:26:18.000+08:00
diff --git a/src/ngx_http_lua_ssl_certby.c b/src/ngx_http_lua_ssl_certby.c
@@ -1333,6 +1333,7 @@ ngx_http_lua_ffi_set_priv_key(ngx_http_request_t *r,
 }
 
 
+#ifndef LIBRESSL_VERSION_NUMBER
 static int
 ngx_http_lua_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store)
 {
@@ -1344,6 +1345,7 @@ ngx_http_lua_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store)
      */
     return 1;
 }
+#endif
 
 
 int

Original file line number	Diff line number	Diff line change
`@@ -1333,6 +1333,7 @@ ngx_http_lua_ffi_set_priv_key(ngx_http_request_t *r,`
`1333`	`1333`	`}`
`1334`	`1334`
`1335`	`1335`
	`1336`	`+#ifndef LIBRESSL_VERSION_NUMBER`
`1336`	`1337`	`static int`
`1337`	`1338`	`ngx_http_lua_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store)`
`1338`	`1339`	`{`
`@@ -1344,6 +1345,7 @@ ngx_http_lua_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store)`
`1344`	`1345`	`*/`
`1345`	`1346`	`return 1;`
`1346`	`1347`	`}`
	`1348`	`+#endif`
`1347`	`1349`
`1348`	`1350`
`1349`	`1351`	`int`