git://git.exim.org
/
users
/
heiko
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1813a1e
)
Constification
author
Jeremy Harris
<jgh146exb@wizmail.org>
Wed, 19 Sep 2018 11:26:47 +0000
(12:26 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Wed, 19 Sep 2018 11:26:47 +0000
(12:26 +0100)
src/src/tls-openssl.c
patch
|
blob
|
history
diff --git
a/src/src/tls-openssl.c
b/src/src/tls-openssl.c
index 0cf66279a506597ed1fb6cac51f0663cc22b2337..e225386db8a91b984e396781029be892e5a8b9cc 100644
(file)
--- a/
src/src/tls-openssl.c
+++ b/
src/src/tls-openssl.c
@@
-2158,10
+2158,10
@@
int rc;
if ( ( !ob->tls_verify_hosts
&& (!ob->tls_try_verify_hosts || !*ob->tls_try_verify_hosts)
)
if ( ( !ob->tls_verify_hosts
&& (!ob->tls_try_verify_hosts || !*ob->tls_try_verify_hosts)
)
- || verify_check_given_host(&ob->tls_verify_hosts, host) == OK
+ || verify_check_given_host(
CUSS
&ob->tls_verify_hosts, host) == OK
)
client_verify_optional = FALSE;
)
client_verify_optional = FALSE;
-else if (verify_check_given_host(&ob->tls_try_verify_hosts, host) == OK)
+else if (verify_check_given_host(
CUSS
&ob->tls_try_verify_hosts, host) == OK)
client_verify_optional = TRUE;
else
return OK;
client_verify_optional = TRUE;
else
return OK;
@@
-2171,7
+2171,7
@@
if ((rc = setup_certs(ctx, ob->tls_verify_certificates,
errstr)) != OK)
return rc;
errstr)) != OK)
return rc;
-if (verify_check_given_host(&ob->tls_verify_cert_hostnames, host) == OK)
+if (verify_check_given_host(
CUSS
&ob->tls_verify_cert_hostnames, host) == OK)
{
cbinfo->verify_cert_hostnames =
#ifdef SUPPORT_I18N
{
cbinfo->verify_cert_hostnames =
#ifdef SUPPORT_I18N
@@
-2311,14
+2311,14
@@
tlsp->tlsa_usage = 0;
# endif
if ((require_ocsp =
# endif
if ((require_ocsp =
- verify_check_given_host(&ob->hosts_require_ocsp, host) == OK))
+ verify_check_given_host(
CUSS
&ob->hosts_require_ocsp, host) == OK))
request_ocsp = TRUE;
else
# ifdef SUPPORT_DANE
if (!request_ocsp)
# endif
request_ocsp =
request_ocsp = TRUE;
else
# ifdef SUPPORT_DANE
if (!request_ocsp)
# endif
request_ocsp =
- verify_check_given_host(&ob->hosts_request_ocsp, host) == OK;
+ verify_check_given_host(
CUSS
&ob->hosts_request_ocsp, host) == OK;
}
#endif
}
#endif
@@
-2444,9
+2444,9
@@
if (request_ocsp)
{ /* Re-eval now $tls_out_tlsa_usage is populated. If
this means we avoid the OCSP request, we wasted the setup
cost in tls_init(). */
{ /* Re-eval now $tls_out_tlsa_usage is populated. If
this means we avoid the OCSP request, we wasted the setup
cost in tls_init(). */
- require_ocsp = verify_check_given_host(&ob->hosts_require_ocsp, host) == OK;
+ require_ocsp = verify_check_given_host(
CUSS
&ob->hosts_require_ocsp, host) == OK;
request_ocsp = require_ocsp
request_ocsp = require_ocsp
- || verify_check_given_host(&ob->hosts_request_ocsp, host) == OK;
+ || verify_check_given_host(
CUSS
&ob->hosts_request_ocsp, host) == OK;
}
}
# endif
}
}
# endif