This way, mod_nss still compiles with older apaches that have no conn_rec.master variable. (And therefore also no #define SSL_ENGINE_SET, which is more recent.)
Patch:
diff -ru mod_nss-mod_nss1018~/mod_nss.c mod_nss-mod_nss1018/mod_nss.c --- mod_nss-mod_nss1018~/mod_nss.c 2019-12-14 10:29:36.000000000 +0100 +++ mod_nss-mod_nss1018/mod_nss.c 2020-01-21 05:07:44.478585502 +0100 @@ -220,6 +220,11 @@ return sslconn; } +static APR_OPTIONAL_FN_TYPE(ssl_proxy_enable) *othermod_proxy_enable; +static APR_OPTIONAL_FN_TYPE(ssl_engine_disable) *othermod_engine_disable; +#ifdef SSL_ENGINE_SET +static APR_OPTIONAL_FN_TYPE(ssl_engine_set) *othermod_engine_set; + static int nss_engine_status(conn_rec *c, SSLConnRec *sslconn) { SSLSrvConfigRec *sc = mySrvConfig(c->base_server); @@ -250,11 +255,6 @@ return OK; } -static APR_OPTIONAL_FN_TYPE(ssl_proxy_enable) *othermod_proxy_enable; -static APR_OPTIONAL_FN_TYPE(ssl_engine_disable) *othermod_engine_disable; -#ifdef SSL_ENGINE_SET -static APR_OPTIONAL_FN_TYPE(ssl_engine_set) *othermod_engine_set; - int nss_engine_set(conn_rec *c, ap_conf_vector_t *per_dir_config, int proxy, int enable)
Which older versions of Apache?
Metadata Update from @rcritten: - Custom field type adjusted to None
httpd-2.4.6-90.el7.centos.x86_64
With that fix mod_nss compiles without problems and then does TLS 1.3 successfully.
Metadata Update from @rcritten: - Issue assigned to rcritten
Patch looks good, thanks. I submitted it as a PR, does this look ok to you?
https://pagure.io/mod_nss/pull-request/50
Looks perfectly ok to me.
Metadata Update from @rcritten: - Issue close_status updated to: fixed - Issue status updated to: Closed (was: Open)